From bcd4fd6f957ec3cccdfa99e9aecc712fe4a35225 Mon Sep 17 00:00:00 2001 From: Rajkumar Manoharan Date: Wed, 8 Dec 2010 20:01:05 +0530 Subject: [PATCH] ath: Missed to clear key4 of micentry 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 Signed-off-by: John W. Linville Signed-off-by: Greg Kroah-Hartman --- drivers/net/wireless/ath/key.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/wireless/ath/key.c b/drivers/net/wireless/ath/key.c index bd21a4d82085..32fcc1993fde 100644 --- a/drivers/net/wireless/ath/key.c +++ b/drivers/net/wireless/ath/key.c @@ -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); }