summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-12-11 21:29:35 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-12-11 21:29:35 +0000
commit6e85bda4cef041ee84fa09027ebcc3957c54b739 (patch)
tree449d6d3a1eac39369bac0c9574d748cd0312ddda
parentaf028d51fa6076d1fc837dd3a03a9e258df48e03 (diff)
ath9k: merge a pending patch for fixing tsf read and write
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24496 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/mac80211/patches/320-ath9k_pending_work.patch22
1 files changed, 22 insertions, 0 deletions
diff --git a/package/mac80211/patches/320-ath9k_pending_work.patch b/package/mac80211/patches/320-ath9k_pending_work.patch
index ba40fe819..baeeb064b 100644
--- a/package/mac80211/patches/320-ath9k_pending_work.patch
+++ b/package/mac80211/patches/320-ath9k_pending_work.patch
@@ -56,3 +56,25 @@
}
/* This should work for all families including legacy */
+--- a/drivers/net/wireless/ath/ath9k/main.c
++++ b/drivers/net/wireless/ath/ath9k/main.c
+@@ -1940,7 +1940,9 @@ static u64 ath9k_get_tsf(struct ieee8021
+ struct ath_softc *sc = aphy->sc;
+
+ mutex_lock(&sc->mutex);
++ ath9k_ps_wakeup(sc);
+ tsf = ath9k_hw_gettsf64(sc->sc_ah);
++ ath9k_ps_restore(sc);
+ mutex_unlock(&sc->mutex);
+
+ return tsf;
+@@ -1952,7 +1954,9 @@ static void ath9k_set_tsf(struct ieee802
+ struct ath_softc *sc = aphy->sc;
+
+ mutex_lock(&sc->mutex);
++ ath9k_ps_wakeup(sc);
+ ath9k_hw_settsf64(sc->sc_ah, tsf);
++ ath9k_ps_restore(sc);
+ mutex_unlock(&sc->mutex);
+ }
+