From: Pavel Roskin <proski@gnu.org>
To: linux-wireless@vger.kernel.org, John W Linville <linville@tuxdriver.com>
Cc: bcm43xx-dev@lists.berlios.de, Johannes Berg <johannes@sipsolutions.net>
Subject: [PATCH] mac80211: fix panic when using hardware WEP
Date: Mon, 02 Jun 2008 07:54:50 -0400 [thread overview]
Message-ID: <20080602115437.12734.42209.stgit@dv.roinet.com> (raw)
57ccbb1cbe3f8e10a500ff8b9fb26dc1a542fe99 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>
---
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;
next reply other threads:[~2008-06-02 11:54 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-02 11:54 Pavel Roskin [this message]
2008-06-02 12:19 ` [PATCH] mac80211: fix panic when using hardware WEP Johannes Berg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080602115437.12734.42209.stgit@dv.roinet.com \
--to=proski@gnu.org \
--cc=bcm43xx-dev@lists.berlios.de \
--cc=johannes@sipsolutions.net \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox