ath9k: Check early for HW reset

chan_lock is not required for checking if
we are in the middle of a HW reset, so do it
early. This also removes the small window
where the lock is dropped and reacquired.

Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c
index aae70a10d1e03b9fcfe2bcb0d9297ce536ea0de5..7193a00d3bcadab83ea07c7905ce4afb06e94624 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/xmit.c
+++ b/drivers/net/wireless/ath/ath9k/xmit.c
@@ -1839,15 +1839,17 @@ void ath_txq_schedule(struct ath_softc *sc, struct ath_txq *txq)
        if (txq->mac80211_qnum < 0)
                return;
 
+       if (test_bit(ATH_OP_HW_RESET, &common->op_flags))
+               return;
+
        spin_lock_bh(&sc->chan_lock);
        ac_list = &sc->cur_chan->acq[txq->mac80211_qnum];
-       spin_unlock_bh(&sc->chan_lock);
 
-       if (test_bit(ATH_OP_HW_RESET, &common->op_flags) ||
-           list_empty(ac_list))
+       if (list_empty(ac_list)) {
+               spin_unlock_bh(&sc->chan_lock);
                return;
+       }
 
-       spin_lock_bh(&sc->chan_lock);
        rcu_read_lock();
 
        last_ac = list_entry(ac_list->prev, struct ath_atx_ac, list);