lkml.org 
[lkml]   [2010]   [Dec]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[020/289] ath9k_hw: handle rx key miss
    2.6.36-stable review patch.  If anyone has any objections, please let us know.

    ------------------

    From: Felix Fietkau <nbd@openwrt.org>

    commit 3ae74c33c4f799f6bf6d67240a94a0814a8f1944 upstream.

    If AR_KeyMiss is set in the rx descriptor and AR_RxFrameOK is unset,
    the hardware could not locate a valid key during a decryption attempt.

    In this case, the frame must not be reported as decrypted, otherwise
    mac80211 sees only random garbage.

    Signed-off-by: Felix Fietkau <nbd@openwrt.org>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/net/wireless/ath/ath9k/ar9003_mac.c | 3 ++-
    drivers/net/wireless/ath/ath9k/mac.c | 2 ++
    2 files changed, 4 insertions(+), 1 deletion(-)

    --- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c
    +++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
    @@ -616,7 +616,8 @@ int ath9k_hw_process_rxdesc_edma(struct
    rxs->rs_status |= ATH9K_RXERR_DECRYPT;
    } else if (rxsp->status11 & AR_MichaelErr) {
    rxs->rs_status |= ATH9K_RXERR_MIC;
    - }
    + } else if (rxsp->status11 & AR_KeyMiss)
    + rxs->rs_status |= ATH9K_RXERR_DECRYPT;
    }

    return 0;
    --- a/drivers/net/wireless/ath/ath9k/mac.c
    +++ b/drivers/net/wireless/ath/ath9k/mac.c
    @@ -713,6 +713,8 @@ int ath9k_hw_rxprocdesc(struct ath_hw *a
    rs->rs_status |= ATH9K_RXERR_DECRYPT;
    else if (ads.ds_rxstatus8 & AR_MichaelErr)
    rs->rs_status |= ATH9K_RXERR_MIC;
    + else if (ads.ds_rxstatus8 & AR_KeyMiss)
    + rs->rs_status |= ATH9K_RXERR_DECRYPT;
    }

    return 0;



    \
     
     \ /
      Last update: 2010-12-08 03:03    [W:0.018 / U:0.976 seconds]
    ©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site