diff options
author | Jouni Malinen <jouni.malinen@atheros.com> | 2008-12-18 07:31:10 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-12-19 15:23:51 -0500 |
commit | ea6121328885640c137b0a8830f67ca6c386a24a (patch) | |
tree | 060d42f09c3d5ae237423b2504c082cceee8d8dd /drivers | |
parent | aa33de09a849bd65b1201e1aec42e3e412c14cf6 (diff) |
ath9k: Fix key cache slot selection for splitmic
ath_reserve_key_cache_slot() was obviously supposed to return an index
to a free slot, not reserved one. This could have caused problems with
hardware revisions that use splitmic.
Signed-off-by: Jouni Malinen <jouni.malinen@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/wireless/ath9k/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath9k/main.c b/drivers/net/wireless/ath9k/main.c index 94c526669a4d..b44736782abd 100644 --- a/drivers/net/wireless/ath9k/main.c +++ b/drivers/net/wireless/ath9k/main.c | |||
@@ -756,12 +756,12 @@ static int ath_reserve_key_cache_slot(struct ath_softc *sc) | |||
756 | (test_bit(i , sc->sc_keymap) || | 756 | (test_bit(i , sc->sc_keymap) || |
757 | test_bit(i + 32, sc->sc_keymap) || | 757 | test_bit(i + 32, sc->sc_keymap) || |
758 | test_bit(i + 64 + 32, sc->sc_keymap))) | 758 | test_bit(i + 64 + 32, sc->sc_keymap))) |
759 | return i; | 759 | return i + 64; |
760 | if (!test_bit(i + 64 + 32, sc->sc_keymap) && | 760 | if (!test_bit(i + 64 + 32, sc->sc_keymap) && |
761 | (test_bit(i, sc->sc_keymap) || | 761 | (test_bit(i, sc->sc_keymap) || |
762 | test_bit(i + 32, sc->sc_keymap) || | 762 | test_bit(i + 32, sc->sc_keymap) || |
763 | test_bit(i + 64, sc->sc_keymap))) | 763 | test_bit(i + 64, sc->sc_keymap))) |
764 | return i; | 764 | return i + 64 + 32; |
765 | } | 765 | } |
766 | } else { | 766 | } else { |
767 | for (i = IEEE80211_WEP_NKID; i < sc->sc_keymax / 2; i++) { | 767 | for (i = IEEE80211_WEP_NKID; i < sc->sc_keymax / 2; i++) { |