From 916db60552f942be622e566c594f4bd30d6d4bbf Mon Sep 17 00:00:00 2001 From: Rajkumar Manoharan Date: Thu, 28 Apr 2011 15:31:57 +0530 Subject: [PATCH] --- yaml --- r: 247521 b: refs/heads/master c: 2f6fc351e6e8c1b6a95140e733607e32bc3a4322 h: refs/heads/master i: 247519: bb633c94a207e71cc2c3f24b079cb2a050b71e8e v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ath/ath9k/main.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d3593e18dc52..97e81da5ad13 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 890641b2512f491f28e4ef7536dca1ea93dae997 +refs/heads/master: 2f6fc351e6e8c1b6a95140e733607e32bc3a4322 diff --git a/trunk/drivers/net/wireless/ath/ath9k/main.c b/trunk/drivers/net/wireless/ath/ath9k/main.c index c3dbf2661a3f..efdafd28fab0 100644 --- a/trunk/drivers/net/wireless/ath/ath9k/main.c +++ b/trunk/drivers/net/wireless/ath/ath9k/main.c @@ -2261,6 +2261,7 @@ static void ath9k_flush(struct ieee80211_hw *hw, bool drop) struct ath_softc *sc = hw->priv; int timeout = 200; /* ms */ int i, j; + bool drain_txq; mutex_lock(&sc->mutex); cancel_delayed_work_sync(&sc->tx_complete_work); @@ -2286,7 +2287,10 @@ static void ath9k_flush(struct ieee80211_hw *hw, bool drop) } ath9k_ps_wakeup(sc); - if (!ath_drain_all_txq(sc, false)) + spin_lock_bh(&sc->sc_pcu_lock); + drain_txq = ath_drain_all_txq(sc, false); + spin_unlock_bh(&sc->sc_pcu_lock); + if (!drain_txq) ath_reset(sc, false); ath9k_ps_restore(sc); ieee80211_wake_queues(hw);