diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-12-30 22:25:51 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-12-30 22:25:51 +0100 |
commit | 66113b437d549ef5cb58ff897309bbf3470fe7ae (patch) | |
tree | dfb736e094616feb1db35873f23d5be030180f2c /ath9k-rx-dma-stop-check.patch | |
parent | c2c67acf1359166b612dcb7787142229252037e5 (diff) | |
parent | 007e505ae0ba5e967c5aebf29885a44263042654 (diff) | |
download | kernel-66113b437d549ef5cb58ff897309bbf3470fe7ae.tar.gz kernel-66113b437d549ef5cb58ff897309bbf3470fe7ae.tar.xz kernel-66113b437d549ef5cb58ff897309bbf3470fe7ae.zip |
merge origin
Diffstat (limited to 'ath9k-rx-dma-stop-check.patch')
-rw-r--r-- | ath9k-rx-dma-stop-check.patch | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/ath9k-rx-dma-stop-check.patch b/ath9k-rx-dma-stop-check.patch deleted file mode 100644 index 40cbafc7b..000000000 --- a/ath9k-rx-dma-stop-check.patch +++ /dev/null @@ -1,38 +0,0 @@ -From: "kernel-team@fedoraproject.org" <kernel-team@fedoraproject.org> -Date: Wed, 6 Feb 2013 09:57:47 -0500 -Subject: [PATCH] ath9k: rx dma stop check - ---- - drivers/net/wireless/ath/ath9k/mac.c | 12 +++++++++++- - 1 file changed, 11 insertions(+), 1 deletion(-) - -diff --git a/drivers/net/wireless/ath/ath9k/mac.c b/drivers/net/wireless/ath/ath9k/mac.c -index bba85d1a6cd1..ebbee8f17130 100644 ---- a/drivers/net/wireless/ath/ath9k/mac.c -+++ b/drivers/net/wireless/ath/ath9k/mac.c -@@ -693,7 +693,7 @@ bool ath9k_hw_stopdmarecv(struct ath_hw *ah, bool *reset) - { - #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 */ -@@ -723,6 +723,16 @@ bool ath9k_hw_stopdmarecv(struct ath_hw *ah, bool *reset) - } - - 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, |