From: Sujith Manoharan Date: Thu, 2 Oct 2014 01:03:14 +0000 (+0530) Subject: ath9k: Fix pending frame check X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=fc1314c75e0558c03cb434e2af2c257caa201e76;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git ath9k: Fix pending frame check Checking for the queue depth outside of the TX queue lock is incorrect and in this case, is not required since it is done inside ath9k_has_pending_frames(). Signed-off-by: Sujith Manoharan Signed-off-by: John W. Linville --- diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c index 4466de0740f9..0b24e62f620d 100644 --- a/drivers/net/wireless/ath/ath9k/main.c +++ b/drivers/net/wireless/ath/ath9k/main.c @@ -1974,9 +1974,6 @@ static bool ath9k_has_tx_pending(struct ath_softc *sc) if (!ATH_TXQ_SETUP(sc, i)) continue; - if (!sc->tx.txq[i].axq_depth) - continue; - npend = ath9k_has_pending_frames(sc, &sc->tx.txq[i]); if (npend) break;