diff options
author | Felix Fietkau <nbd@openwrt.org> | 2011-11-18 11:27:19 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2011-11-18 11:27:19 +0000 |
commit | 7edf0229435ce1d11bc8096c95e93373d7fda71f (patch) | |
tree | 5366708341c61ef88965c36fb8e15bdd4088cd3a /package/mac80211/patches/562-ath9k_fix_flush.patch | |
parent | 7d6a631816dfec96e57068189d2a5c463e0d1314 (diff) | |
download | master-187ad058-7edf0229435ce1d11bc8096c95e93373d7fda71f.tar.gz master-187ad058-7edf0229435ce1d11bc8096c95e93373d7fda71f.tar.bz2 master-187ad058-7edf0229435ce1d11bc8096c95e93373d7fda71f.zip |
mac80211: update to wireless-testing 2011-11-15
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29240 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/562-ath9k_fix_flush.patch')
-rw-r--r-- | package/mac80211/patches/562-ath9k_fix_flush.patch | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/package/mac80211/patches/562-ath9k_fix_flush.patch b/package/mac80211/patches/562-ath9k_fix_flush.patch deleted file mode 100644 index a5329adc96..0000000000 --- a/package/mac80211/patches/562-ath9k_fix_flush.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- a/drivers/net/wireless/ath/ath9k/main.c -+++ b/drivers/net/wireless/ath/ath9k/main.c -@@ -2268,9 +2268,6 @@ static void ath9k_flush(struct ieee80211 - return; - } - -- if (drop) -- timeout = 1; -- - for (j = 0; j < timeout; j++) { - bool npend = false; - -@@ -2288,21 +2285,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); - } |