From f5eb9eb34f1ea30bb2122f4f1f5ba3b014600d15 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes@sipsolutions.net>
Date: Wed, 27 May 2009 10:35:29 +0200
Subject: [PATCH] --- yaml --- r: 150655 b: refs/heads/master c:
 034d655ee7b79a2f48ba4c2b620d2864a6e0aa14 h: refs/heads/master i:   150653:
 cb350154e39f2267edc660871fe81349277ba9fb   150651:
 53b6ad011d68baa539b6f1a33969e55b160b37ac   150647:
 f4d13da700f263159620f583f81243cf4a5f495e   150639:
 04962131c23297ea823c65969dfc0b9c8a9a5df5   150623:
 e0f030801a006a5bf88a9284450c0b161ec33f5b   150591:
 5b34939b2a88e17fe150587fb708f59cfacae8a5   150527:
 1df12be69c9b9a3fe7034e285c1ce5b42bcadc80 v: v3

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

diff --git a/[refs] b/[refs]
index 4fc890faf603..3dc48a5a2664 100644
--- 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
index 909ebd6ec78b..fd392fff5fb6 100644
--- 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;