Subject: [PATCH] mac80211: Populate HT limitation with TKIP/WEP to the handler for SIOCSIWENCODE too

Signed-off-by: Vasanthakumar Thiagarajan <[email protected]>
---
net/mac80211/wext.c | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)

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 @@ static int ieee80211_ioctl_siwencode(struct net_device *dev,
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 @@ static int ieee80211_ioctl_siwencode(struct net_device *dev,
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;
}


--
1.5.5.1