aboutsummaryrefslogtreecommitdiffstats
path: root/package/mac80211/patches/590-ath9k_fix_cycle_counter_ps.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2010-11-11 22:39:12 +0000
committerFelix Fietkau <nbd@openwrt.org>2010-11-11 22:39:12 +0000
commit7faef97df732c299e8b0404070fbd5d3bbb81b2c (patch)
treee3494ed1cacb1e258cc117559a923684a740b3c5 /package/mac80211/patches/590-ath9k_fix_cycle_counter_ps.patch
parent6592cbf3cbd36d79d5a07908867b330de39537d7 (diff)
downloadmaster-187ad058-7faef97df732c299e8b0404070fbd5d3bbb81b2c.tar.gz
master-187ad058-7faef97df732c299e8b0404070fbd5d3bbb81b2c.tar.bz2
master-187ad058-7faef97df732c299e8b0404070fbd5d3bbb81b2c.zip
mac80211: update to wireless-testing 2010-11-10 + some pending work
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23968 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/590-ath9k_fix_cycle_counter_ps.patch')
-rw-r--r--package/mac80211/patches/590-ath9k_fix_cycle_counter_ps.patch33
1 files changed, 0 insertions, 33 deletions
diff --git a/package/mac80211/patches/590-ath9k_fix_cycle_counter_ps.patch b/package/mac80211/patches/590-ath9k_fix_cycle_counter_ps.patch
deleted file mode 100644
index 4ee5f7359e..0000000000
--- a/package/mac80211/patches/590-ath9k_fix_cycle_counter_ps.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/drivers/net/wireless/ath/ath9k/main.c
-+++ b/drivers/net/wireless/ath/ath9k/main.c
-@@ -94,11 +94,13 @@ void ath9k_ps_wakeup(struct ath_softc *s
- {
- struct ath_common *common = ath9k_hw_common(sc->sc_ah);
- unsigned long flags;
-+ enum ath9k_power_mode power_mode;
-
- spin_lock_irqsave(&sc->sc_pm_lock, flags);
- if (++sc->ps_usecount != 1)
- goto unlock;
-
-+ power_mode = sc->sc_ah->power_mode;
- ath9k_hw_setpower(sc->sc_ah, ATH9K_PM_AWAKE);
-
- /*
-@@ -106,10 +108,12 @@ void ath9k_ps_wakeup(struct ath_softc *s
- * useful data. Better clear them now so that they don't mess up
- * survey data results.
- */
-- spin_lock(&common->cc_lock);
-- ath_hw_cycle_counters_update(common);
-- memset(&common->cc_survey, 0, sizeof(common->cc_survey));
-- spin_unlock(&common->cc_lock);
-+ if (power_mode != ATH9K_PM_AWAKE) {
-+ spin_lock(&common->cc_lock);
-+ ath_hw_cycle_counters_update(common);
-+ memset(&common->cc_survey, 0, sizeof(common->cc_survey));
-+ spin_unlock(&common->cc_lock);
-+ }
-
- unlock:
- spin_unlock_irqrestore(&sc->sc_pm_lock, flags);