Commit e8009e98 authored by Sujith's avatar Sujith Committed by John W. Linville
Browse files

ath9k: Fix TX queue draining 



When TX DMA termination has failed, the HW has to be reset
completely. Doing a fast channel change in this case is insufficient.
Also, change the debug level of a couple of messages to FATAL.

Cc: stable@kernel.org
Signed-off-by: default avatarSujith <Sujith.Manoharan@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 17b182e3

drivers/net/wireless/ath/ath9k/mac.c

+1 −1
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ bool ath9k_hw_stoptxdma(struct ath_hw *ah, u32 q) 
		wait = wait_time;

		while (ath9k_hw_numtxpending(ah, q)) {

			if ((--wait) == 0) {

				ath_print(common, ATH_DBG_QUEUE,

				ath_print(common, ATH_DBG_FATAL,

					  "Failed to stop TX DMA in 100 "

					  "msec after killing last frame\n");

				break;

drivers/net/wireless/ath/ath9k/xmit.c

+2 −2
Original line number Diff line number Diff line
@@ -1108,11 +1108,11 @@ void ath_drain_all_txq(struct ath_softc *sc, bool retry_tx) 
	if (npend) {

		int r;



		ath_print(common, ATH_DBG_XMIT,

		ath_print(common, ATH_DBG_FATAL,

			  "Unable to stop TxDMA. Reset HAL!\n");



		spin_lock_bh(&sc->sc_resetlock);

		r = ath9k_hw_reset(ah, sc->sc_ah->curchan, true);

		r = ath9k_hw_reset(ah, sc->sc_ah->curchan, false);

		if (r)

			ath_print(common, ATH_DBG_FATAL,

				  "Unable to reset hardware; reset status %d\n",

CRA Git | Maintained and supported by SUSTech CRA and CCSE