---

yaml --- r: 275673 b: refs/heads/master c: 133a3ff h: refs/heads/master i: 275671: cf17d95 v: v3
git-mirror · Nov 7, 2011 · 9fbc1a5 · 9fbc1a5
1 parent af7beec
commit 9fbc1a5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git 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
@@ -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) {