Home » Mailing list archives » linux-kernel » 2008 » June » 2

Re: Wireless-testing's b43 panics in b43_generate_txhdr on packet transmit

Previous thread: Inquiry: Should we remove "isolcpus= kernel boot option? (may have realtime uses) by Paul Jackson on Sunday, June 1, 2008 - 10:30 pm. (59 messages)

Next thread: Re: [Bug #10638] sysbench+mysql(oltp, readonly) 30% regression with 2.6.26-rc1 by Zhang, Yanmin on Monday, June 2, 2008 - 12:57 am. (3 messages)
[view original message]
From: Pavel Roskin <proski@...>
To: Johannes Berg <johannes@...>
Cc: linux-wireless <linux-wireless@...>, bcm43xx-dev@lists.berlios.de <bcm43xx-dev@...>, Michael Buesch <mb@...>, <linux-kernel@...>
Subject: Re: Wireless-testing's b43 panics in b43_generate_txhdr on packet transmit
Date: Monday, June 2, 2008 - 12:33 am

That was it!  Here's the patch (I'll submit it to John tomorrow if nobody objects).


mac80211: fix hardware WEP support


Setting hardware WEP key was accidentally moved to a wrong place in

57ccbb1cbe3f8e10a500ff8b9fb26dc1a542fe99.  Move it back.  This fixes

kernel panic in b43 if WEP is used.


Signed-off-by: Pavel Roskin <proski@gnu.org>

---


 net/mac80211/wep.c |    2 +-

 1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/net/mac80211/wep.c b/net/mac80211/wep.c

index c9fd129..e7b6344 100644

--- a/net/mac80211/wep.c

+++ b/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;


--

Regards,

Pavel Roskin

--
Previous thread: Inquiry: Should we remove "isolcpus= kernel boot option? (may have realtime uses) by Paul Jackson on Sunday, June 1, 2008 - 10:30 pm. (59 messages)

Next thread: Re: [Bug #10638] sysbench+mysql(oltp, readonly) 30% regression with 2.6.26-rc1 by Zhang, Yanmin on Monday, June 2, 2008 - 12:57 am. (3 messages)