diff options
author | Felix Fietkau <nbd@openwrt.org> | 2011-11-05 19:51:32 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2011-11-05 19:51:32 +0000 |
commit | db2558451b9ecb4b840ec49dd129ba3d898f54e7 (patch) | |
tree | acf93ba78838f2221ef8534e341ff40332b4a367 /package/mac80211/patches/561-ath9k_fix_flush.patch | |
parent | 7bca010b34a113f4daa3052ba6277c7b54d26723 (diff) | |
download | upstream-db2558451b9ecb4b840ec49dd129ba3d898f54e7.tar.gz upstream-db2558451b9ecb4b840ec49dd129ba3d898f54e7.tar.bz2 upstream-db2558451b9ecb4b840ec49dd129ba3d898f54e7.zip |
ath9k: add some fixes for radio reinit and frame flush
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28772 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/561-ath9k_fix_flush.patch')
-rw-r--r-- | package/mac80211/patches/561-ath9k_fix_flush.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/package/mac80211/patches/561-ath9k_fix_flush.patch b/package/mac80211/patches/561-ath9k_fix_flush.patch new file mode 100644 index 0000000000..58b71201a7 --- /dev/null +++ b/package/mac80211/patches/561-ath9k_fix_flush.patch @@ -0,0 +1,45 @@ +--- a/drivers/net/wireless/ath/ath9k/main.c ++++ b/drivers/net/wireless/ath/ath9k/main.c +@@ -2259,9 +2259,6 @@ static void ath9k_flush(struct ieee80211 + return; + } + +- if (drop) +- timeout = 1; +- + for (j = 0; j < timeout; j++) { + bool npend = false; + +@@ -2279,21 +2276,22 @@ static void ath9k_flush(struct ieee80211 + } + + if (!npend) +- goto out; ++ break; + } + +- ath9k_ps_wakeup(sc); +- spin_lock_bh(&sc->sc_pcu_lock); +- drain_txq = ath_drain_all_txq(sc, false); +- spin_unlock_bh(&sc->sc_pcu_lock); ++ if (drop) { ++ ath9k_ps_wakeup(sc); ++ 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); ++ if (!drain_txq) ++ ath_reset(sc, false); + +- ath9k_ps_restore(sc); +- ieee80211_wake_queues(hw); ++ ath9k_ps_restore(sc); ++ ieee80211_wake_queues(hw); ++ } + +-out: + ieee80211_queue_delayed_work(hw, &sc->tx_complete_work, 0); + mutex_unlock(&sc->mutex); + } |