Skip to content

Commit

Permalink
ath9k: Fix queue handling in flush()
Browse files Browse the repository at this point in the history
When draining of the TX queues fails, a
full HW reset is done. ath_reset() makes sure
that the queues in mac80211 are restarted,
so there is no need to wake them up again.

Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Sujith Manoharan authored and John W. Linville committed Oct 2, 2014
1 parent 60913f4 commit 4f82eec
Showing 1 changed file with 0 additions and 5 deletions.
5 changes: 0 additions & 5 deletions drivers/net/wireless/ath/ath9k/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -1999,7 +1999,6 @@ void __ath9k_flush(struct ieee80211_hw *hw, u32 queues, bool drop)
struct ath_common *common = ath9k_hw_common(ah);
int timeout = HZ / 5; /* 200 ms */
bool drain_txq;
int i;

cancel_delayed_work_sync(&sc->tx_complete_work);

Expand Down Expand Up @@ -2027,10 +2026,6 @@ void __ath9k_flush(struct ieee80211_hw *hw, u32 queues, bool drop)
ath_reset(sc);

ath9k_ps_restore(sc);
for (i = 0; i < IEEE80211_NUM_ACS; i++) {
ieee80211_wake_queue(sc->hw,
sc->cur_chan->hw_queue_base + i);
}
}

ieee80211_queue_delayed_work(hw, &sc->tx_complete_work, 0);
Expand Down

0 comments on commit 4f82eec

Please sign in to comment.