diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-12-30 15:48:18 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-12-30 15:48:18 +0000 |
| commit | d6f780b09c98532a3494e80035b9622e83c606fa (patch) | |
| tree | a40ef436fadec1bab8943c9b4641b27b2baace52 /package/mac80211 | |
| parent | fef64804ddf489a29279204713303767c8c2238d (diff) | |
ath9k: fix rx dma descriptor error flag handling
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24855 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211')
| -rw-r--r-- | package/mac80211/patches/560-ath9k_rx_error_handling.patch | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/package/mac80211/patches/560-ath9k_rx_error_handling.patch b/package/mac80211/patches/560-ath9k_rx_error_handling.patch new file mode 100644 index 000000000..d66e747af --- /dev/null +++ b/package/mac80211/patches/560-ath9k_rx_error_handling.patch @@ -0,0 +1,53 @@ +--- a/drivers/net/wireless/ath/ath9k/mac.c ++++ b/drivers/net/wireless/ath/ath9k/mac.c +@@ -692,15 +692,16 @@ int ath9k_hw_rxprocdesc(struct ath_hw *a + if ((ads.ds_rxstatus8 & AR_RxFrameOK) == 0) { + if (ads.ds_rxstatus8 & AR_CRCErr) + rs->rs_status |= ATH9K_RXERR_CRC; +- else if (ads.ds_rxstatus8 & AR_PHYErr) { ++ if (ads.ds_rxstatus8 & AR_PHYErr) { + rs->rs_status |= ATH9K_RXERR_PHY; + phyerr = MS(ads.ds_rxstatus8, AR_PHYErrCode); + rs->rs_phyerr = phyerr; +- } else if (ads.ds_rxstatus8 & AR_DecryptCRCErr) ++ } ++ if (ads.ds_rxstatus8 & AR_DecryptCRCErr) + rs->rs_status |= ATH9K_RXERR_DECRYPT; +- else if (ads.ds_rxstatus8 & AR_MichaelErr) ++ if (ads.ds_rxstatus8 & AR_MichaelErr) + rs->rs_status |= ATH9K_RXERR_MIC; +- else if (ads.ds_rxstatus8 & AR_KeyMiss) ++ if (ads.ds_rxstatus8 & AR_KeyMiss) + rs->rs_status |= ATH9K_RXERR_DECRYPT; + } + +--- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c ++++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c +@@ -613,9 +613,9 @@ int ath9k_hw_process_rxdesc_edma(struct + * possibly be reviewing the last subframe. AR_CRCErr + * is the CRC of the actual data. + */ +- if (rxsp->status11 & AR_CRCErr) { ++ if (rxsp->status11 & AR_CRCErr) + rxs->rs_status |= ATH9K_RXERR_CRC; +- } else if (rxsp->status11 & AR_PHYErr) { ++ if (rxsp->status11 & AR_PHYErr) { + phyerr = MS(rxsp->status11, AR_PHYErrCode); + /* + * If we reach a point here where AR_PostDelimCRCErr is +@@ -638,11 +638,12 @@ int ath9k_hw_process_rxdesc_edma(struct + rxs->rs_phyerr = phyerr; + } + +- } else if (rxsp->status11 & AR_DecryptCRCErr) { ++ } ++ if (rxsp->status11 & AR_DecryptCRCErr) + rxs->rs_status |= ATH9K_RXERR_DECRYPT; +- } else if (rxsp->status11 & AR_MichaelErr) { ++ if (rxsp->status11 & AR_MichaelErr) + rxs->rs_status |= ATH9K_RXERR_MIC; +- } else if (rxsp->status11 & AR_KeyMiss) ++ if (rxsp->status11 & AR_KeyMiss) + rxs->rs_status |= ATH9K_RXERR_DECRYPT; + } + |