ath9k: decouple RX error checking for DFS

Previous RX error checking was done exclusive-or for different error
types and caused DFS pulse events to be dropped when other error
flags (e.g. CRC) were set simultaneously.

This patch decouples PHY error processing from other types and ensures
that all pulses detected by HW are accounted by the pattern detector.

Signed-off-by: Zefir Kurtisi <zefir.kurtisi@neratec.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 6 insertions, 6 deletions

diff --git a/drivers/net/wireless/ath/ath9k/ar9003_mac.c b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
index 51687e3f63d8..8d1bca03bc0e 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
@@ -510,7 +510,11 @@ int ath9k_hw_process_rxdesc_edma(struct ath_hw *ah, struct ath_rx_status *rxs,
                  */
                 if (rxsp->status11 & AR_CRCErr)
                         rxs->rs_status |= ATH9K_RXERR_CRC;
-                else if (rxsp->status11 & AR_PHYErr) {
+                else if (rxsp->status11 & AR_DecryptCRCErr)
+                        rxs->rs_status |= ATH9K_RXERR_DECRYPT;
+                else if (rxsp->status11 & AR_MichaelErr)
+                        rxs->rs_status |= ATH9K_RXERR_MIC;
+                if (rxsp->status11 & AR_PHYErr) {
                         phyerr = MS(rxsp->status11, AR_PHYErrCode);
                         /*
                          * If we reach a point here where AR_PostDelimCRCErr is
@@ -532,11 +536,7 @@ int ath9k_hw_process_rxdesc_edma(struct ath_hw *ah, struct ath_rx_status *rxs,
                                 rxs->rs_status |= ATH9K_RXERR_PHY;
                                 rxs->rs_phyerr = phyerr;
                         }
-
-                } else if (rxsp->status11 & AR_DecryptCRCErr)
-                        rxs->rs_status |= ATH9K_RXERR_DECRYPT;
-                else if (rxsp->status11 & AR_MichaelErr)
-                        rxs->rs_status |= ATH9K_RXERR_MIC;
+                };
         }
 
         if (rxsp->status11 & AR_KeyMiss)