ath9k: merge a pending patch for fixing a stopped queue issue (mostly for client mode)
SVN-Revision: 26280
This commit is contained in:
parent
d16f80c95d
commit
80239ff7b0
2 changed files with 13 additions and 2 deletions
|
@ -368,3 +368,14 @@
|
|||
u64 ath9k_hw_gettsf64(struct ath_hw *ah);
|
||||
void ath9k_hw_settsf64(struct ath_hw *ah, u64 tsf64);
|
||||
void ath9k_hw_reset_tsf(struct ath_hw *ah);
|
||||
--- 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
|
||||
if (!ath_drain_all_txq(sc, false))
|
||||
ath_reset(sc, false);
|
||||
|
||||
+ ieee80211_wake_queues(hw);
|
||||
+
|
||||
out:
|
||||
ieee80211_queue_delayed_work(hw, &sc->tx_complete_work, 0);
|
||||
mutex_unlock(&sc->mutex);
|
||||
|
|
|
@ -57,7 +57,7 @@
|
|||
static int ath9k_conf_tx(struct ieee80211_hw *hw, u16 queue,
|
||||
const struct ieee80211_tx_queue_params *params)
|
||||
{
|
||||
@@ -2177,6 +2198,7 @@ struct ieee80211_ops ath9k_ops = {
|
||||
@@ -2179,6 +2200,7 @@ struct ieee80211_ops ath9k_ops = {
|
||||
.configure_filter = ath9k_configure_filter,
|
||||
.sta_add = ath9k_sta_add,
|
||||
.sta_remove = ath9k_sta_remove,
|
||||
|
@ -223,7 +223,7 @@
|
|||
/* PHY ops */
|
||||
--- a/drivers/net/wireless/ath/ath9k/hw.h
|
||||
+++ b/drivers/net/wireless/ath/ath9k/hw.h
|
||||
@@ -646,6 +646,7 @@ struct ath_hw_ops {
|
||||
@@ -644,6 +644,7 @@ struct ath_hw_ops {
|
||||
u32 burstDuration);
|
||||
void (*set11n_virtualmorefrag)(struct ath_hw *ah, void *ds,
|
||||
u32 vmf);
|
||||
|
|
Loading…
Reference in a new issue