From 389ff26839daba7bba19402925ad4d5ef602ee4e Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@intel.com>
Date: Sun, 10 Oct 2010 18:52:10 +0200
Subject: [PATCH] --- yaml --- r: 215311 b: refs/heads/master c:
 730bd83b036e72b0134352ca27e76ea08475fbf1 h: refs/heads/master i:   215309:
 e87aa863a0920a096311ebd716af288260c8c010   215307:
 a841c50472bac9035c1ae33d5b50f1e063a7bd82   215303:
 b34043f7514b02b5c9bb454c455a779c8b97b804   215295:
 55b3d532c9f8e86286e5ed7fe14e25a73896e622 v: v3

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

diff --git a/[refs] b/[refs]
index 12fe56f88918..123b1c4e5307 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cc2858c987f41286e059ee777c3bc09f7b7c19f6
+refs/heads/master: 730bd83b036e72b0134352ca27e76ea08475fbf1
diff --git a/trunk/net/mac80211/wep.c b/trunk/net/mac80211/wep.c
index f27484c22b9f..2ff6d1e3ed21 100644
--- a/trunk/net/mac80211/wep.c
+++ b/trunk/net/mac80211/wep.c
@@ -222,7 +222,7 @@ static int ieee80211_wep_decrypt(struct ieee80211_local *local,
 				 struct ieee80211_key *key)
 {
 	u32 klen;
-	u8 *rc4key;
+	u8 rc4key[3 + WLAN_KEY_LEN_WEP104];
 	u8 keyidx;
 	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
 	unsigned int hdrlen;
@@ -245,10 +245,6 @@ static int ieee80211_wep_decrypt(struct ieee80211_local *local,
 
 	klen = 3 + key->conf.keylen;
 
-	rc4key = kmalloc(klen, GFP_ATOMIC);
-	if (!rc4key)
-		return -1;
-
 	/* Prepend 24-bit IV to RC4 key */
 	memcpy(rc4key, skb->data + hdrlen, 3);
 
@@ -260,8 +256,6 @@ static int ieee80211_wep_decrypt(struct ieee80211_local *local,
 				       len))
 		ret = -1;
 
-	kfree(rc4key);
-
 	/* Trim ICV */
 	skb_trim(skb, skb->len - WEP_ICV_LEN);