diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2012-12-07 16:46:04 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2012-12-07 16:46:04 +0000 |
| commit | 6ec11910ca5abfb3d646d15ca11e1c7ed48cfc3e (patch) | |
| tree | e53928d7ac5004a755b1a8455945a93fa17386dc /package/mac80211/patches/552-ath9k_rx_dma_stop_check.patch | |
| parent | 104526605c12d4e37b9bf2aab92baf3f79addb4c (diff) | |
| download | upstream-6ec11910ca5abfb3d646d15ca11e1c7ed48cfc3e.tar.gz upstream-6ec11910ca5abfb3d646d15ca11e1c7ed48cfc3e.tar.bz2 upstream-6ec11910ca5abfb3d646d15ca11e1c7ed48cfc3e.zip | |
mac80211: update to wireless-testing 2012-12-06
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34571 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/552-ath9k_rx_dma_stop_check.patch')
| -rw-r--r-- | package/mac80211/patches/552-ath9k_rx_dma_stop_check.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/package/mac80211/patches/552-ath9k_rx_dma_stop_check.patch b/package/mac80211/patches/552-ath9k_rx_dma_stop_check.patch new file mode 100644 index 0000000000..606eb1c63d --- /dev/null +++ b/package/mac80211/patches/552-ath9k_rx_dma_stop_check.patch @@ -0,0 +1,28 @@ +--- a/drivers/net/wireless/ath/ath9k/mac.c ++++ b/drivers/net/wireless/ath/ath9k/mac.c +@@ -689,7 +689,7 @@ bool ath9k_hw_stopdmarecv(struct ath_hw + { + #define AH_RX_STOP_DMA_TIMEOUT 10000 /* usec */ + struct ath_common *common = ath9k_hw_common(ah); +- u32 mac_status, last_mac_status = 0; ++ u32 mac_status = 0, last_mac_status = 0; + int i; + + /* Enable access to the DMA observation bus */ +@@ -719,6 +719,16 @@ bool ath9k_hw_stopdmarecv(struct ath_hw + } + + if (i == 0) { ++ if (!AR_SREV_9300_20_OR_LATER(ah) && ++ (mac_status & 0x700) == 0) { ++ /* ++ * DMA is idle but the MAC is still stuck ++ * processing events ++ */ ++ *reset = true; ++ return true; ++ } ++ + ath_err(common, + "DMA failed to stop in %d ms AR_CR=0x%08x AR_DIAG_SW=0x%08x DMADBG_7=0x%08x\n", + AH_RX_STOP_DMA_TIMEOUT / 1000, |