diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2011-03-23 20:16:53 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2011-03-23 20:16:53 +0000 |
| commit | 40cd387c9aa34c87468e3abadb60a3a60bd743e3 (patch) | |
| tree | 5be988b33c9bda0b69b3312e403efa4ed72165e5 | |
| parent | a6f7a8be7b90538d71e745fe2af1b3826a2e55f7 (diff) | |
| download | upstream-40cd387c9aa34c87468e3abadb60a3a60bd743e3.tar.gz upstream-40cd387c9aa34c87468e3abadb60a3a60bd743e3.tar.bz2 upstream-40cd387c9aa34c87468e3abadb60a3a60bd743e3.zip | |
ath9k: merge a pending patch for fixing a stopped queue issue (mostly for client mode)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26280 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/mac80211/patches/300-ath9k_pending_work.patch | 11 | ||||
| -rw-r--r-- | package/mac80211/patches/521-ath9k_fix_ap_ps_buffering.patch | 4 |
2 files changed, 13 insertions, 2 deletions
diff --git a/package/mac80211/patches/300-ath9k_pending_work.patch b/package/mac80211/patches/300-ath9k_pending_work.patch index 7d4301db96..f294a8c97f 100644 --- a/package/mac80211/patches/300-ath9k_pending_work.patch +++ b/package/mac80211/patches/300-ath9k_pending_work.patch @@ -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); diff --git a/package/mac80211/patches/521-ath9k_fix_ap_ps_buffering.patch b/package/mac80211/patches/521-ath9k_fix_ap_ps_buffering.patch index 4799d5f910..b2d2f6110f 100644 --- a/package/mac80211/patches/521-ath9k_fix_ap_ps_buffering.patch +++ b/package/mac80211/patches/521-ath9k_fix_ap_ps_buffering.patch @@ -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); |