diff options
author | Felix Fietkau <nbd@openwrt.org> | 2013-08-13 10:35:14 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2013-08-13 10:35:14 +0000 |
commit | 339fd0a8e13f237a67685d224a9cfb36d157fc62 (patch) | |
tree | d8f26b6a25f9511f3ef9b5f59d4d25b30392039b /package/kernel/mac80211/patches/541-ath9k_rx_dma_stop_check.patch | |
parent | 6d651b4e3d6de30fd31fce25fa8e4b4b39b2b3a7 (diff) | |
download | upstream-339fd0a8e13f237a67685d224a9cfb36d157fc62.tar.gz upstream-339fd0a8e13f237a67685d224a9cfb36d157fc62.tar.bz2 upstream-339fd0a8e13f237a67685d224a9cfb36d157fc62.zip |
ath9k: reorganize patches
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37766 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel/mac80211/patches/541-ath9k_rx_dma_stop_check.patch')
-rw-r--r-- | package/kernel/mac80211/patches/541-ath9k_rx_dma_stop_check.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/package/kernel/mac80211/patches/541-ath9k_rx_dma_stop_check.patch b/package/kernel/mac80211/patches/541-ath9k_rx_dma_stop_check.patch new file mode 100644 index 0000000000..5d063c7d65 --- /dev/null +++ b/package/kernel/mac80211/patches/541-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 +@@ -705,7 +705,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 */ +@@ -735,6 +735,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, |