diff options
| author | Clark Williams <williams@redhat.com> | 2012-01-25 21:31:16 -0600 |
|---|---|---|
| committer | Clark Williams <williams@redhat.com> | 2012-01-25 21:31:16 -0600 |
| commit | 974f4b86951972b133b4ec5b36956b979dea08d0 (patch) | |
| tree | 090b441b1c96f708e8a033c7f88fa383dd1e7cba /drivers/net/wireless/ath/ath9k/mac.c | |
| parent | 40a54e2e116950a27dbd0a46a7b1ff8e982de477 (diff) | |
| parent | 3499d6424f682a58761d827012567c552b053842 (diff) | |
Merge commit 'v3.2.2' into rt-3.2.2-rt10
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/mac.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/mac.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/ath9k/mac.c b/drivers/net/wireless/ath/ath9k/mac.c index ecdb6fd29079..bbcb777dcf31 100644 --- a/drivers/net/wireless/ath/ath9k/mac.c +++ b/drivers/net/wireless/ath/ath9k/mac.c @@ -621,10 +621,11 @@ 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) - rs->rs_status |= ATH9K_RXERR_KEYMISS; } + if (ads.ds_rxstatus8 & AR_KeyMiss) + rs->rs_status |= ATH9K_RXERR_KEYMISS; + return 0; } EXPORT_SYMBOL(ath9k_hw_rxprocdesc); |