From: Vasanthakumar Thiagarajan <vasanth@atheros.com>
Date: Fri, 27 Mar 2009 07:38:45 +0000 (+0530)
Subject: mac80211: Don't access managed mode bits in non-managed mode
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=b0741a1a2b00d9b4d88ba60016c88e42f176e4d6;p=deliverable%2Flinux.git

mac80211: Don't access managed mode bits in non-managed mode

This fixes a stupid bug introduced in 25f85c31d4f..

Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/net/mac80211/wext.c b/net/mac80211/wext.c
index 959aa8379ccf..a52fb3a4a455 100644
--- a/net/mac80211/wext.c
+++ b/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