(pre stable) ath9k_hw: partially revert "fix dma descriptor rx error bit parsing"
authorFelix Fietkau <nbd@openwrt.org>
Thu, 13 Jan 2011 23:06:27 +0000 (00:06 +0100)
committerBrad Figg <brad.figg@canonical.com>
Wed, 27 Apr 2011 18:42:38 +0000 (11:42 -0700)
commit0ce260b37b523766f7fa0dc33b6981f0d85de9e2
treed6164e3e2f2c8502ecbcb9870ef3fa3d1badd4cb
parent0e83bbc6b23bd5aa39d5eddef33437f4b104e473
(pre stable) ath9k_hw: partially revert "fix dma descriptor rx error bit parsing"

BugLink: http://bugs.launchpad.net/bugs/735171

The rx error bit parsing was changed to consider PHY errors and various
decryption errors separately. While correct according to the documentation,
this is causing spurious decryption error reports in some situations.

Fix this by restoring the original order of the checks in those places,
where the errors are meant to be mutually exclusive.

If a CRC error is reported, then MIC failure and decryption errors
are irrelevant, and a PHY error is unlikely.

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
(cherry picked from commit 115dad7a7f42e68840392767323ceb9306dbdb36)

Acked-by: Seth Forshee <seth.forshee@canonical.com>
Acked-by: John Johansen <john.johansen@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
drivers/net/wireless/ath/ath9k/ar9003_mac.c
drivers/net/wireless/ath/ath9k/mac.c