---

yaml --- r: 183870 b: refs/heads/master c: e4fca00 h: refs/heads/master v: v3
git-mirror · Jan 22, 2010 · 3677666 · 3677666
1 parent b84b000
commit 3677666
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 64147c729732ba9c9e50966971bdfbd503c888bb
+refs/heads/master: e4fca007b06165900d0e44e8d5e251376819bf5d
diff --git a/trunk/net/mac80211/wep.c b/trunk/net/mac80211/wep.c
@@ -310,9 +310,8 @@ static int wep_encrypt_skb(struct ieee80211_tx_data *tx, struct sk_buff *skb)
 					  tx->key->conf.keylen,
 					  tx->key->conf.keyidx))
 			return -1;
-	}
-
-	if (info->control.hw_key->flags & IEEE80211_KEY_FLAG_GENERATE_IV) {
+	} else if (info->control.hw_key->flags &
+			IEEE80211_KEY_FLAG_GENERATE_IV) {
 		if (!ieee80211_wep_add_iv(tx->local, skb,
 					  tx->key->conf.keylen,
 					  tx->key->conf.keyidx))