diff options
author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-10-16 02:30:30 +0000 |
---|---|---|
committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-10-16 02:30:30 +0000 |
commit | cbe6c66638efddd36b0bb71f46dd5f5689a3e045 (patch) | |
tree | 7fc287bd3cfab8f40a0baaf8e6d80aa0a530401d /package/mac80211/patches/521-ath9k_ani_listen_time_fix.patch | |
parent | fdb67f01dfbe2d6c79f7433f55baef1786d74d0c (diff) |
mac80211: update to wireless-testing 2010-10-15, add a few ath9k fixes and performance enhancements
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23470 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/521-ath9k_ani_listen_time_fix.patch')
-rw-r--r-- | package/mac80211/patches/521-ath9k_ani_listen_time_fix.patch | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/package/mac80211/patches/521-ath9k_ani_listen_time_fix.patch b/package/mac80211/patches/521-ath9k_ani_listen_time_fix.patch new file mode 100644 index 000000000..598286ec9 --- /dev/null +++ b/package/mac80211/patches/521-ath9k_ani_listen_time_fix.patch @@ -0,0 +1,52 @@ +--- a/drivers/net/wireless/ath/ath9k/ani.c ++++ b/drivers/net/wireless/ath/ath9k/ani.c +@@ -633,7 +633,7 @@ void ath9k_ani_reset(struct ath_hw *ah, + REGWRITE_BUFFER_FLUSH(ah); + } + +-static void ath9k_hw_ani_read_counters(struct ath_hw *ah) ++static bool ath9k_hw_ani_read_counters(struct ath_hw *ah) + { + struct ath_common *common = ath9k_hw_common(ah); + struct ar5416AniState *aniState = &ah->curchan->ani; +@@ -646,10 +646,10 @@ static void ath9k_hw_ani_read_counters(s + ath_hw_cycle_counters_update(common); + listenTime = ath_hw_get_listen_time(common); + +- if (listenTime < 0) { ++ if (listenTime <= 0) { + ah->stats.ast_ani_lneg++; + ath9k_ani_restart(ah); +- return; ++ return false; + } + + if (!use_new_ani(ah)) { +@@ -683,7 +683,7 @@ static void ath9k_hw_ani_read_counters(s + REG_WRITE(ah, AR_PHY_ERR_MASK_2, + AR_PHY_ERR_CCK_TIMING); + } +- return; ++ return false; + } + + ofdmPhyErrCnt = phyCnt1 - ofdm_base; +@@ -695,7 +695,7 @@ static void ath9k_hw_ani_read_counters(s + ah->stats.ast_ani_cckerrs += + cckPhyErrCnt - aniState->cckPhyErrCount; + aniState->cckPhyErrCount = cckPhyErrCnt; +- ++ return true; + } + + void ath9k_hw_ani_monitor(struct ath_hw *ah, struct ath9k_channel *chan) +@@ -711,7 +711,8 @@ void ath9k_hw_ani_monitor(struct ath_hw + if (WARN_ON(!aniState)) + return; + +- ath9k_hw_ani_read_counters(ah); ++ if (!ath9k_hw_ani_read_counters(ah)) ++ return; + + ofdmPhyErrRate = aniState->ofdmPhyErrCount * 1000 / + aniState->listenTime; |