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;