diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2010-08-28 18:21:21 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-08-31 14:22:23 -0400 |
| commit | 56363ddeeed3afc5277ca227209773bc1042cc7b (patch) | |
| tree | 2f92621e743983cb10175bbbd009ae2e167d1054 /drivers/net/wireless/ath/ath9k/mac.c | |
| parent | 3653910714a4a9b19aadb202c24f7b1ae61d3556 (diff) | |
| download | kernel_samsung_smdk4412-56363ddeeed3afc5277ca227209773bc1042cc7b.zip kernel_samsung_smdk4412-56363ddeeed3afc5277ca227209773bc1042cc7b.tar.gz kernel_samsung_smdk4412-56363ddeeed3afc5277ca227209773bc1042cc7b.tar.bz2 | |
ath9k: fix spurious MIC failure reports
According to the hardware documentation, the MIC failure bit is only
valid if the frame was decrypted using a valid TKIP key and is not a
fragment.
In some setups I've seen hardware-reported MIC failures on an AP that
was configured for CCMP only, so it's clear that additional checks are
necessary.
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Cc: stable@kernel.org
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/mac.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/mac.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath9k/mac.c b/drivers/net/wireless/ath/ath9k/mac.c index e955bb9..0b7d125 100644 --- a/drivers/net/wireless/ath/ath9k/mac.c +++ b/drivers/net/wireless/ath/ath9k/mac.c @@ -711,7 +711,8 @@ int ath9k_hw_rxprocdesc(struct ath_hw *ah, struct ath_desc *ds, rs->rs_phyerr = phyerr; } else if (ads.ds_rxstatus8 & AR_DecryptCRCErr) rs->rs_status |= ATH9K_RXERR_DECRYPT; - else if (ads.ds_rxstatus8 & AR_MichaelErr) + else if ((ads.ds_rxstatus8 & AR_MichaelErr) && + rs->rs_keyix != ATH9K_RXKEYIX_INVALID) rs->rs_status |= ATH9K_RXERR_MIC; } |