diff options
| author | Tejun Heo <tj@kernel.org> | 2011-05-24 03:59:36 -0400 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2011-05-24 03:59:36 -0400 |
| commit | 6988f20fe04e9ef3aea488cb8ab57fbeb78e12f0 (patch) | |
| tree | c9d7fc50a2e2147a5ca07e3096e7eeb916ad2da9 /drivers/net/wireless/ath/ath9k/main.c | |
| parent | 0415b00d175e0d8945e6785aad21b5f157976ce0 (diff) | |
| parent | 6ea0c34dac89611126455537552cffe6c7e832ad (diff) | |
Merge branch 'fixes-2.6.39' into for-2.6.40
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/main.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/main.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c index 115f162c617..524825720a0 100644 --- a/drivers/net/wireless/ath/ath9k/main.c +++ b/drivers/net/wireless/ath/ath9k/main.c | |||
| @@ -2160,6 +2160,8 @@ static void ath9k_flush(struct ieee80211_hw *hw, bool drop) | |||
| 2160 | if (!ath_drain_all_txq(sc, false)) | 2160 | if (!ath_drain_all_txq(sc, false)) |
| 2161 | ath_reset(sc, false); | 2161 | ath_reset(sc, false); |
| 2162 | 2162 | ||
| 2163 | ieee80211_wake_queues(hw); | ||
| 2164 | |||
| 2163 | out: | 2165 | out: |
| 2164 | ieee80211_queue_delayed_work(hw, &sc->tx_complete_work, 0); | 2166 | ieee80211_queue_delayed_work(hw, &sc->tx_complete_work, 0); |
| 2165 | mutex_unlock(&sc->mutex); | 2167 | mutex_unlock(&sc->mutex); |