Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2b212141 authored Jun 02, 2008 by Pavel Roskin Committed by John W. Linville Jun 03, 2008

mac80211: fix panic when using hardware WEP



e039fa4a ("mac80211: move TX info into
skb->cb") misplaced code for setting hardware WEP keys.  Move it back.
This fixes kernel panic in b43 if WEP is used and hardware encryption
is enabled.

Signed-off-by: Pavel Roskin <proski@gnu.org>
Acked-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

parent 5854a32e

net/mac80211/wep.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;