From 4cd60715b67df2803e719d094e93ca368236ae38 Mon Sep 17 00:00:00 2001 From: Vasanthakumar Thiagarajan Date: Fri, 13 Mar 2009 20:26:52 +0530 Subject: [PATCH] --- yaml --- r: 136127 b: refs/heads/master c: ec30415f7935f0ff92f93a4ac87233ca3007a78a h: refs/heads/master i: 136125: 1b9f3c302a73ad4a53e9ef56f20d86002cb0ed27 136123: 1c7b9e0d7140310049d2a7f4e4fcb800d9978ec6 136119: 50954f4cb46c2dc18cda0bab5feaf2b984b645bd 136111: e9aa24cfadec8a921f1ca107c9f70c2b5c2599e8 136095: dad818d595b2bedfa00e4823a871f316c3e447c9 136063: eb4becd5e54d54a1e0881773cc568ecb9350a527 v: v3 --- [refs] | 2 +- trunk/net/mac80211/wext.c | 13 +++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 9918d508bd86..dd512d19c83d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aae89831df03e5282a8f5c0ee46432cfb677fc5c +refs/heads/master: ec30415f7935f0ff92f93a4ac87233ca3007a78a diff --git a/trunk/net/mac80211/wext.c b/trunk/net/mac80211/wext.c index 935c63ed3dfa..e55d2834764c 100644 --- a/trunk/net/mac80211/wext.c +++ b/trunk/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; }