From f75ac90b695da2226a25c47d30156983df87ec7b Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Wed, 3 Nov 2010 14:56:05 +0000 Subject: [PATCH] ath9k: fix cycle counter tracking SVN-Revision: 23824 --- .../590-ath9k_fix_cycle_counter_ps.patch | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 package/mac80211/patches/590-ath9k_fix_cycle_counter_ps.patch diff --git a/package/mac80211/patches/590-ath9k_fix_cycle_counter_ps.patch b/package/mac80211/patches/590-ath9k_fix_cycle_counter_ps.patch new file mode 100644 index 0000000000..4ee5f7359e --- /dev/null +++ b/package/mac80211/patches/590-ath9k_fix_cycle_counter_ps.patch @@ -0,0 +1,33 @@ +--- 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);