From 36776668fd90e636bf48f1a03e80a70f4b19e399 Mon Sep 17 00:00:00 2001
From: "John W. Linville" <linville@tuxdriver.com>
Date: Fri, 22 Jan 2010 12:33:09 -0500
Subject: [PATCH] --- yaml --- r: 183870 b: refs/heads/master c:
 e4fca007b06165900d0e44e8d5e251376819bf5d h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/net/mac80211/wep.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index de61c3e03457..54aeb40036ec 100644
--- 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
index 0a4c641c9605..5d745f2d7236 100644
--- 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))