From: Ivo van Doorn <ivdoorn@gmail.com>
To: John W Linville <linville@tuxdriver.com>
Cc: linux-wireless@vger.kernel.org,
rt2400-devel@lists.sourceforge.net,
"Stephen Blackheath" <tramp.enshrine.stephen@blacksapphire.com>
Subject: [PATCH] rt2x00: Fix HW crypto key handling
Date: Mon, 22 Sep 2008 19:40:04 +0200 [thread overview]
Message-ID: <200809221940.04297.IvDoorn@gmail.com> (raw)
When a crypto key is being removed, rt2x00mac should not
reset the key->hw_key_idx value because that will prevent
the driver from removing the correct key from the hardware.
Furthermore ffz() starts counting at 0 instead of 1, so we don't
need to substract 1 from the resulting value.
Signed-off-by: Stephen Blackheath <tramp.enshrine.stephen@blacksapphire.com>
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
---
diff --git a/drivers/net/wireless/rt2x00/rt2x00mac.c b/drivers/net/wireless/rt2x00/rt2x00mac.c
index 56829fa..bad7662 100644
--- a/drivers/net/wireless/rt2x00/rt2x00mac.c
+++ b/drivers/net/wireless/rt2x00/rt2x00mac.c
@@ -543,7 +543,8 @@ int rt2x00mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
* provided but key 0 is not, then the key is not found
* by the hardware during RX).
*/
- key->hw_key_idx = 0;
+ if (cmd == SET_KEY)
+ key->hw_key_idx = 0;
if (key->flags & IEEE80211_KEY_FLAG_PAIRWISE)
set_key = rt2x00dev->ops->lib->config_pairwise_key;
diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c
index 2c36b91..a461620 100644
--- a/drivers/net/wireless/rt2x00/rt61pci.c
+++ b/drivers/net/wireless/rt2x00/rt61pci.c
@@ -381,7 +381,7 @@ static int rt61pci_config_shared_key(struct rt2x00_dev *rt2x00dev,
if (reg && reg == mask)
return -ENOSPC;
- key->hw_key_idx += reg ? (ffz(reg) - 1) : 0;
+ key->hw_key_idx += reg ? ffz(reg) : 0;
/*
* Upload key to hardware
@@ -477,7 +477,7 @@ static int rt61pci_config_pairwise_key(struct rt2x00_dev *rt2x00dev,
return -ENOSPC;
}
- key->hw_key_idx += reg ? (ffz(reg) - 1) : 0;
+ key->hw_key_idx += reg ? ffz(reg) : 0;
/*
* Upload key to hardware
diff --git a/drivers/net/wireless/rt2x00/rt73usb.c b/drivers/net/wireless/rt2x00/rt73usb.c
index 27dde3e..934f8e0 100644
--- a/drivers/net/wireless/rt2x00/rt73usb.c
+++ b/drivers/net/wireless/rt2x00/rt73usb.c
@@ -393,7 +393,7 @@ static int rt73usb_config_shared_key(struct rt2x00_dev *rt2x00dev,
if (reg && reg == mask)
return -ENOSPC;
- key->hw_key_idx += reg ? (ffz(reg) - 1) : 0;
+ key->hw_key_idx += reg ? ffz(reg) : 0;
/*
* Upload key to hardware
@@ -494,7 +494,7 @@ static int rt73usb_config_pairwise_key(struct rt2x00_dev *rt2x00dev,
return -ENOSPC;
}
- key->hw_key_idx += reg ? (ffz(reg) - 1) : 0;
+ key->hw_key_idx += reg ? ffz(reg) : 0;
/*
* Upload key to hardware
reply other threads:[~2008-09-22 17:40 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=200809221940.04297.IvDoorn@gmail.com \
--to=ivdoorn@gmail.com \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=rt2400-devel@lists.sourceforge.net \
--cc=tramp.enshrine.stephen@blacksapphire.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.