From 09fa224051c32fad3a0cc78b2cee99f44f0f5ee1 Mon Sep 17 00:00:00 2001
From: Pavel Roskin <proski@gnu.org>
Date: Mon, 2 Jun 2008 07:54:50 -0400
Subject: [PATCH] --- yaml --- r: 102847 b: refs/heads/master c:
 2b2121417eff64125bdb7f322d3b533e06d73dae h: refs/heads/master i:   102845:
 f1707651445d348cdf8141bcfd3b7cb508eea69d   102843:
 9b834982b308e011295f2b29d8e6494e0a558aa6   102839:
 6e3cd11a055afeab44e751f432703fa224eab704   102831:
 ad6d48348d38e8d02ac88a66e0a36c9c2715dd0c   102815:
 a810476f8e9b823b6bcf2349fb207976e80c78d1   102783:
 6f3fb2d95cf9df953d16941501b6d266ad5e1274 v: v3

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

diff --git a/[refs] b/[refs]
index ab9bc5a6c875..dbee886e5e61 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5854a32e6cb672d182ce378c69f0f7470137a062
+refs/heads/master: 2b2121417eff64125bdb7f322d3b533e06d73dae
diff --git a/trunk/net/mac80211/wep.c b/trunk/net/mac80211/wep.c
index c9fd1291b19d..e7b6344c900a 100644
--- a/trunk/net/mac80211/wep.c
+++ b/trunk/net/mac80211/wep.c
@@ -335,10 +335,10 @@ static int wep_encrypt_skb(struct ieee80211_tx_data *tx, struct sk_buff *skb)
 	info->control.icv_len = WEP_ICV_LEN;
 
 	if (!(tx->key->flags & KEY_FLAG_UPLOADED_TO_HARDWARE)) {
-		info->control.hw_key = &tx->key->conf;
 		if (ieee80211_wep_encrypt(tx->local, skb, tx->key))
 			return -1;
 	} else {
+		info->control.hw_key = &tx->key->conf;
 		if (tx->key->conf.flags & IEEE80211_KEY_FLAG_GENERATE_IV) {
 			if (!ieee80211_wep_add_iv(tx->local, skb, tx->key))
 				return -1;