]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
ath9k: fix keycache leak in split tkip case
authorMing Lei <tom.leiming@gmail.com>
Sat, 6 Feb 2010 14:38:23 +0000 (22:38 +0800)
committerGreg Kroah-Hartman <gregkh@suse.de>
Mon, 15 Mar 2010 16:05:58 +0000 (09:05 -0700)
commit 733da37dab72de6b3f8b0c56b5cdea322f18a684 upstream.

If split tkip key is used, ath_delete_key should delete
rx key and rx mic key. This patch fixes the leak of hw
keycache in the case.

Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/net/wireless/ath/ath9k/main.c

index 643bea35686fe302f582078226bc3d1e3e531c9a..aebaa0af008a47a992249b2daf1a47d304924ac4 100644 (file)
@@ -928,6 +928,7 @@ static void ath_key_delete(struct ath_common *common, struct ieee80211_key_conf
 
        clear_bit(key->hw_key_idx + 64, common->keymap);
        if (common->splitmic) {
+               ath9k_hw_keyreset(ah, key->hw_key_idx + 32);
                clear_bit(key->hw_key_idx + 32, common->keymap);
                clear_bit(key->hw_key_idx + 64 + 32, common->keymap);
        }