From: nbd Date: Sat, 11 Dec 2010 21:29:35 +0000 (+0000) Subject: ath9k: merge a pending patch for fixing tsf read and write X-Git-Url: https://git.rohieb.name/openwrt.git/commitdiff_plain/6e85bda4cef041ee84fa09027ebcc3957c54b739?ds=sidebyside 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 --- 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); + } +