commit ec30415f7935f0ff92f93a4ac87233ca3007a78a
author Vasanthakumar Thiagarajan <vasanth@atheros.com> Fri Mar 13 20:26:52 2009 +0530
committer John W. Linville <linville@tuxdriver.com> Fri Mar 27 20:12:52 2009 -0400
tree 15d32b4bd16db54167e5f0c8cad58ad25b749a62
parent aae89831df03e5282a8f5c0ee46432cfb677fc5c

mac80211: Populate HT limitation with TKIP/WEP to the handler for SIOCSIWENCODE too

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

net/mac80211/wext.c

diff --git a/net/mac80211/wext.c b/net/mac80211/wext.c
index 935c63e..e55d283 100644
--- a/net/mac80211/wext.c
+++ b/net/mac80211/wext.c
@@ -630,7 +630,7 @@
 	struct ieee80211_sub_if_data *sdata;
 	int idx, i, alg = ALG_WEP;
 	u8 bcaddr[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
-	int remove = 0;
+	int remove = 0, ret;
 
 	sdata = IEEE80211_DEV_TO_SUB_IF(dev);
 
@@ -656,11 +656,20 @@
 		return 0;
 	}
 
-	return ieee80211_set_encryption(
+	ret = ieee80211_set_encryption(
 		sdata, bcaddr,
 		idx, alg, remove,
 		!sdata->default_key,
 		keybuf, erq->length);
+
+	if (!ret) {
+		if (remove)
+			sdata->u.mgd.flags &= ~IEEE80211_STA_TKIP_WEP_USED;
+		else
+			sdata->u.mgd.flags |= IEEE80211_STA_TKIP_WEP_USED;
+	}
+
+	return ret;
 }