On Mon, 2008-06-02 at 07:54 -0400, Pavel Roskin wrote:
> 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.
Oh wow, yes, sorry about that, and thanks for tracking it down!
> Signed-off-by: Pavel Roskin <proski@xxxxxxx>
Acked-by: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
> ---
>
> 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;
>
Attachment:
signature.asc
Description: This is a digitally signed message part
