]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ath: Missed to clear key4 of micentry
authorRajkumar Manoharan <rmanoharan@atheros.com>
Wed, 8 Dec 2010 14:31:05 +0000 (20:01 +0530)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 17 Feb 2011 23:13:56 +0000 (15:13 -0800)
commit 998d516d9546eba04dd99ae49a78acb0cf770478 upstream.

key4 of micentry is used, if ATH_CRYPT_CAP_MIC_COMBINED is set.
But is not cleared on key cache reset.

Signed-off-by: Rajkumar Manoharan <rmanoharan@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/net/wireless/ath/key.c

index bd21a4d82085b5131cb89497bff4d939275c3748..32fcc1993fdef3ce25465269c33d19a32ad3703a 100644 (file)
@@ -60,6 +60,8 @@ bool ath_hw_keyreset(struct ath_common *common, u16 entry)
                REG_WRITE(ah, AR_KEYTABLE_KEY1(micentry), 0);
                REG_WRITE(ah, AR_KEYTABLE_KEY2(micentry), 0);
                REG_WRITE(ah, AR_KEYTABLE_KEY3(micentry), 0);
+               if (common->crypt_caps & ATH_CRYPT_CAP_MIC_COMBINED)
+                       REG_WRITE(ah, AR_KEYTABLE_KEY4(micentry), 0);
 
        }