releases/3.0.1/ath9k_hw-fix-incorrect-key_miss-handling.patch

   1 From 0472ade031b5c0c69c21cf96acf64c50eb9ba3c2 Mon Sep 17 00:00:00 2001
   2 From: Senthil Balasubramanian <senthilb@qca.qualcomm.com>
   3 Date: Tue, 12 Jul 2011 00:02:56 +0530
   4 Subject: ath9k_hw: Fix incorrect key_miss handling
   5
   6 From: Senthil Balasubramanian <senthilb@qca.qualcomm.com>
   7
   8 commit 0472ade031b5c0c69c21cf96acf64c50eb9ba3c2 upstream.
   9
  10 Decryping frames on key_miss handling shouldn't be done for Michael
  11 MIC failed frames as h/w would have already decrypted such frames
  12 successfully anyway.
  13
  14 Also leaving CRC and PHY error(where the frame is going to be dropped
  15 anyway), we are left to prcoess Decrypt error for which s/w decrypt is
  16 selected anway and so having key_miss as a separate check doesn't serve
  17 anything. So making key_miss handling mutually exlusive with other RX
  18 status handling makes much more sense.
  19
  20 This patch addresses an issue with STA not reporting MIC failure events
  21 resulting in STA being disconnected immediately.
  22
  23 Signed-off-by: Senthil Balasubramanian <senthilb@qca.qualcomm.com>
  24 Signed-off-by: John W. Linville <linville@tuxdriver.com>
  25 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  26
  27 ---
  28  drivers/net/wireless/ath/ath9k/ar9003_mac.c |    3 +--
  29  drivers/net/wireless/ath/ath9k/mac.c        |    3 +--
  30  2 files changed, 2 insertions(+), 4 deletions(-)
  31
  32 --- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c
  33 +++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
  34 @@ -629,8 +629,7 @@ int ath9k_hw_process_rxdesc_edma(struct
  35                         rxs->rs_status |= ATH9K_RXERR_DECRYPT;
  36                 else if (rxsp->status11 & AR_MichaelErr)
  37                         rxs->rs_status |= ATH9K_RXERR_MIC;
  38 -
  39 -               if (rxsp->status11 & AR_KeyMiss)
  40 +               else if (rxsp->status11 & AR_KeyMiss)
  41                         rxs->rs_status |= ATH9K_RXERR_DECRYPT;
  42         }
  43
  44 --- a/drivers/net/wireless/ath/ath9k/mac.c
  45 +++ b/drivers/net/wireless/ath/ath9k/mac.c
  46 @@ -645,8 +645,7 @@ int ath9k_hw_rxprocdesc(struct ath_hw *a
  47                         rs->rs_status |= ATH9K_RXERR_DECRYPT;
  48                 else if (ads.ds_rxstatus8 & AR_MichaelErr)
  49                         rs->rs_status |= ATH9K_RXERR_MIC;
  50 -
  51 -               if (ads.ds_rxstatus8 & AR_KeyMiss)
  52 +               else if (ads.ds_rxstatus8 & AR_KeyMiss)
  53                         rs->rs_status |= ATH9K_RXERR_DECRYPT;
  54         }
  55