]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
ath9k: fix timeout on stopping rx dma
authorFelix Fietkau <nbd@openwrt.org>
Sat, 20 Nov 2010 02:08:47 +0000 (03:08 +0100)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 22 Nov 2010 20:19:31 +0000 (15:19 -0500)
It seems that using ath9k_hw_stoppcurecv to stop rx dma is not enough.
When it's time to stop DMA, the PCU is still busy, so the rx enable
bit never clears.
Using ath9k_hw_abortpcurecv helps with getting rx stopped much faster,
with this change, I cannot reproduce the rx stop related WARN_ON anymore.

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Cc: stable@kernel.org
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/ath/ath9k/recv.c

index c76ea53c20ce7dbe41863c00930853a59ccc6cf8..1a62e351ec77c217598a46fae7bdbcc84c1c6050 100644 (file)
@@ -518,7 +518,7 @@ bool ath_stoprecv(struct ath_softc *sc)
        bool stopped;
 
        spin_lock_bh(&sc->rx.rxbuflock);
-       ath9k_hw_stoppcurecv(ah);
+       ath9k_hw_abortpcurecv(ah);
        ath9k_hw_setrxfilter(ah, 0);
        stopped = ath9k_hw_stopdmarecv(ah);