---

yaml --- r: 102847 b: refs/heads/master c: 2b21214 h: refs/heads/master i: 102845: f170765 102843: 9b83498 102839: 6e3cd11 102831: ad6d483 102815: a810476 102783: 6f3fb2d v: v3
git-mirror · Jun 3, 2008 · 09fa224 · 09fa224
1 parent 6ed2bd7
commit 09fa224
Show file tree

Hide file tree

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