---

yaml --- r: 150655 b: refs/heads/master c: 034d655 h: refs/heads/master i: 150653: cb35015 150651: 53b6ad0 150647: f4d13da 150639: 0496213 150623: e0f0308 150591: 5b34939 150527: 1df12be v: v3
git-mirror · Jun 3, 2009 · f5eb9eb · f5eb9eb
1 parent ce4d1e2
commit f5eb9eb
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: 7ba10a8efe501e26d995aa9b6dc13395518a87e4
+refs/heads/master: 034d655ee7b79a2f48ba4c2b620d2864a6e0aa14
diff --git a/trunk/net/wireless/nl80211.c b/trunk/net/wireless/nl80211.c
@@ -1687,6 +1687,12 @@ static int nl80211_set_station(struct sk_buff *skb, struct genl_info *info)
 	if (err)
 		goto out_rtnl;
 
+	if (dev->ieee80211_ptr->iftype != NL80211_IFTYPE_AP &&
+	    dev->ieee80211_ptr->iftype != NL80211_IFTYPE_AP_VLAN) {
+		err = -EINVAL;
+		goto out;
+	}
+
 	err = get_vlan(info->attrs[NL80211_ATTR_STA_VLAN], drv, &params.vlan);
 	if (err)
 		goto out;