From 9fbc1a5aa5adb12207d23966827e338f057edb01 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@intel.com>
Date: Thu, 3 Nov 2011 14:50:13 +0100
Subject: [PATCH] --- yaml --- r: 275673 b: refs/heads/master c:
 133a3ff2c934223a8143bfa52401bba962a97165 h: refs/heads/master i:   275671:
 cf17d952fc4e158b8061e464cb2cdc7ca713bc75 v: v3

---
 [refs]                       | 2 +-
 trunk/net/wireless/nl80211.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 299d42efcaf6..b4874339c3e2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6c7394197af90f6a332180e33f5d025d3037d883
+refs/heads/master: 133a3ff2c934223a8143bfa52401bba962a97165
diff --git a/trunk/net/wireless/nl80211.c b/trunk/net/wireless/nl80211.c
index b587857a9d7d..b3a476fe8272 100644
--- a/trunk/net/wireless/nl80211.c
+++ b/trunk/net/wireless/nl80211.c
@@ -1252,6 +1252,12 @@ static int nl80211_set_wiphy(struct sk_buff *skb, struct genl_info *info)
 			goto bad_res;
 		}
 
+		if (netdev->ieee80211_ptr->iftype != NL80211_IFTYPE_AP &&
+		    netdev->ieee80211_ptr->iftype != NL80211_IFTYPE_P2P_GO) {
+			result = -EINVAL;
+			goto bad_res;
+		}
+
 		nla_for_each_nested(nl_txq_params,
 				    info->attrs[NL80211_ATTR_WIPHY_TXQ_PARAMS],
 				    rem_txq_params) {