From cc71e8443511954f346aa8ae51c1399adf957222 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes@sipsolutions.net>
Date: Mon, 11 May 2009 14:43:13 +0200
Subject: [PATCH] --- yaml --- r: 150283 b: refs/heads/master c:
 e80cf8537ae54ec96c389055d6e9b0ef630c042d h: refs/heads/master i:   150281:
 4acdd621b254d45ce4b1c2f8f3095b06f619e6f9   150279:
 827ad4718ca0de38175344b29faf50ce7ae35621 v: v3

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

diff --git a/[refs] b/[refs]
index c59e0e06dfd6..e8b87a354096 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 528769cf1e422d932052be1487459262f3d75333
+refs/heads/master: e80cf8537ae54ec96c389055d6e9b0ef630c042d
diff --git a/trunk/net/wireless/nl80211.c b/trunk/net/wireless/nl80211.c
index 79927706937a..a39e4644778b 100644
--- a/trunk/net/wireless/nl80211.c
+++ b/trunk/net/wireless/nl80211.c
@@ -1746,6 +1746,12 @@ static int nl80211_new_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;
@@ -1789,6 +1795,12 @@ static int nl80211_del_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;
+	}
+
 	if (!drv->ops->del_station) {
 		err = -EOPNOTSUPP;
 		goto out;