---

yaml --- r: 194169 b: refs/heads/master c: d5d9de0 h: refs/heads/master i: 194167: 63eef80 v: v3
git-mirror · Mar 31, 2010 · 9acec39 · 9acec39
1 parent 8d3b927
commit 9acec39
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 932d37c094b3c3410b4059f18f3b5c756bff059a
+refs/heads/master: d5d9de024c157a3dfbab191241c5c51e4d4c069a
diff --git a/trunk/net/wireless/nl80211.c b/trunk/net/wireless/nl80211.c
@@ -2096,7 +2096,8 @@ static int nl80211_del_station(struct sk_buff *skb, struct genl_info *info)
 		goto out_rtnl;
 
 	if (dev->ieee80211_ptr->iftype != NL80211_IFTYPE_AP &&
-	    dev->ieee80211_ptr->iftype != NL80211_IFTYPE_AP_VLAN) {
+	    dev->ieee80211_ptr->iftype != NL80211_IFTYPE_AP_VLAN &&
+	    dev->ieee80211_ptr->iftype != NL80211_IFTYPE_MESH_POINT) {
 		err = -EINVAL;
 		goto out;
 	}