diff --git a/[refs] b/[refs]
index 901611ca39ea..c5766476ec4d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9f201a87831af9458df1eda65941c955f2da87ed
+refs/heads/master: b0741a1a2b00d9b4d88ba60016c88e42f176e4d6
diff --git a/trunk/net/mac80211/wext.c b/trunk/net/mac80211/wext.c
index 959aa8379ccf..a52fb3a4a455 100644
--- a/trunk/net/mac80211/wext.c
+++ b/trunk/net/mac80211/wext.c
@@ -675,7 +675,7 @@ static int ieee80211_ioctl_siwencode(struct net_device *dev,
 		!sdata->default_key,
 		keybuf, erq->length);
 
-	if (!ret) {
+	if (!ret && sdata->vif.type == NL80211_IFTYPE_STATION) {
 		if (remove)
 			sdata->u.mgd.flags &= ~IEEE80211_STA_TKIP_WEP_USED;
 		else