ath9k_hw: prevent a fast channel change after a rx DMA stuck issue

If the receive path gets stuck, a full hardware reset is necessary to
recover from it. If this happens during a scan, the whole scan might fail,
as each channel change bypasses the full reset sequence.
Fix this by resetting the fast channel change flag if stopping the
receive path fails.

This will reduce the number of error messages that look like this:
ath: DMA failed to stop in 10 ms AR_CR=0x00000024 AR_DIAG_SW=0x40000020

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Cc: stable@kernel.org
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c
index 2acd7998559971c5614b6d1d2845c5234d33d250..2f83f975b89185871720137ad97e47bcc02e50e5 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
@@ -1232,9 +1232,11 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,
 
        if (!ah->chip_fullsleep) {
                ath9k_hw_abortpcurecv(ah);
-               if (!ath9k_hw_stopdmarecv(ah))
+               if (!ath9k_hw_stopdmarecv(ah)) {
                        ath_print(common, ATH_DBG_XMIT,
                                "Failed to stop receive dma\n");
+                       bChannelChange = false;
+               }
        }
 
        if (!ath9k_hw_setpower(ah, ATH9K_PM_AWAKE))