summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVasanthakumar Thiagarajan <vasanth@atheros.com>2009-03-27 08:38:45 +0100
committerJohn W. Linville <linville@tuxdriver.com>2009-04-22 22:54:27 +0200
commitb0741a1a2b00d9b4d88ba60016c88e42f176e4d6 (patch)
treeed047544a7caa10195ac144b00e87fb552c4609c
parentp54spi: compensate firmware alignment bug in p54spi_rx (diff)
downloadlinux-b0741a1a2b00d9b4d88ba60016c88e42f176e4d6.tar.xz
linux-b0741a1a2b00d9b4d88ba60016c88e42f176e4d6.zip
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>
-rw-r--r--net/mac80211/wext.c2
1 files changed, 1 insertions, 1 deletions
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