---

yaml --- r: 136127 b: refs/heads/master c: ec30415 h: refs/heads/master i: 136125: 1b9f3c3 136123: 1c7b9e0 136119: 50954f4 136111: e9aa24c 136095: dad818d 136063: eb4becd v: v3
git-mirror · Mar 28, 2009 · 4cd6071 · 4cd6071
1 parent 7d76319
commit 4cd6071
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git 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
@@ -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;
 }