aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2010-12-11 21:29:35 +0000
committerFelix Fietkau <nbd@openwrt.org>2010-12-11 21:29:35 +0000
commit8f676da3d8eb5a2a38a0821f8b2a576c5f42f328 (patch)
tree619811f2fa4b538c75eb8fc9c01c428652309bce
parent8f27618e1f1f6c27566c7f545ab077c7959dfcb5 (diff)
downloadupstream-8f676da3d8eb5a2a38a0821f8b2a576c5f42f328.tar.gz
upstream-8f676da3d8eb5a2a38a0821f8b2a576c5f42f328.tar.bz2
upstream-8f676da3d8eb5a2a38a0821f8b2a576c5f42f328.zip
ath9k: merge a pending patch for fixing tsf read and write
SVN-Revision: 24496
-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 ba40fe8194..baeeb064b6 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);
+ }
+