ath9k_hw: Fix incorrect key_miss handling
authorSenthil Balasubramanian <senthilb@qca.qualcomm.com>
Mon, 11 Jul 2011 18:32:56 +0000 (00:02 +0530)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 13 Jul 2011 18:49:35 +0000 (14:49 -0400)
Decryping frames on key_miss handling shouldn't be done for Michael
MIC failed frames as h/w would have already decrypted such frames
successfully anyway.

Also leaving CRC and PHY error(where the frame is going to be dropped
anyway), we are left to prcoess Decrypt error for which s/w decrypt is
selected anway and so having key_miss as a separate check doesn't serve
anything. So making key_miss handling mutually exlusive with other RX
status handling makes much more sense.

This patch addresses an issue with STA not reporting MIC failure events
resulting in STA being disconnected immediately.

Cc: stable@kernel.org
Signed-off-by: Senthil Balasubramanian <senthilb@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/ath/ath9k/ar9003_mac.c
drivers/net/wireless/ath/ath9k/mac.c

index 575e185f454f7e933f0711bcda845d082ffa6b02..8ff0b88a29b9ab4c436870ad3ea6d2d09b030f67 100644 (file)
@@ -625,8 +625,7 @@ int ath9k_hw_process_rxdesc_edma(struct ath_hw *ah, struct ath_rx_status *rxs,
                        rxs->rs_status |= ATH9K_RXERR_DECRYPT;
                else if (rxsp->status11 & AR_MichaelErr)
                        rxs->rs_status |= ATH9K_RXERR_MIC;
-
-               if (rxsp->status11 & AR_KeyMiss)
+               else if (rxsp->status11 & AR_KeyMiss)
                        rxs->rs_status |= ATH9K_RXERR_DECRYPT;
        }
 
index c2091f1f409616cf6a3d131a19b2f3c2dd341980..b6b523a897e54db4f2673e9597583576da145917 100644 (file)
@@ -645,8 +645,7 @@ int ath9k_hw_rxprocdesc(struct ath_hw *ah, struct ath_desc *ds,
                        rs->rs_status |= ATH9K_RXERR_DECRYPT;
                else if (ads.ds_rxstatus8 & AR_MichaelErr)
                        rs->rs_status |= ATH9K_RXERR_MIC;
-
-               if (ads.ds_rxstatus8 & AR_KeyMiss)
+               else if (ads.ds_rxstatus8 & AR_KeyMiss)
                        rs->rs_status |= ATH9K_RXERR_DECRYPT;
        }