aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2010-10-12 14:11:21 +0000
committerFelix Fietkau <nbd@openwrt.org>2010-10-12 14:11:21 +0000
commit103e70a573e6b42484631b21fee06074e5b7cdec (patch)
tree54923126950075f1059d15fad2230013e1d8804e
parent0cad2678ac64694c5e5b0e73726be595cb29ae01 (diff)
downloadupstream-103e70a573e6b42484631b21fee06074e5b7cdec.tar.gz
upstream-103e70a573e6b42484631b21fee06074e5b7cdec.tar.bz2
upstream-103e70a573e6b42484631b21fee06074e5b7cdec.zip
ath9k: fix a few ani issues
SVN-Revision: 23412
-rw-r--r--package/mac80211/patches/528-ath9k_ani_listen_time_fix.patch52
-rw-r--r--package/mac80211/patches/529-ath9k_ani_overflow_fix.patch11
-rw-r--r--package/mac80211/patches/530-ath9k_cycle_counter_lock_fix.patch12
3 files changed, 75 insertions, 0 deletions
diff --git a/package/mac80211/patches/528-ath9k_ani_listen_time_fix.patch b/package/mac80211/patches/528-ath9k_ani_listen_time_fix.patch
new file mode 100644
index 0000000000..598286ec9e
--- /dev/null
+++ b/package/mac80211/patches/528-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;
diff --git a/package/mac80211/patches/529-ath9k_ani_overflow_fix.patch b/package/mac80211/patches/529-ath9k_ani_overflow_fix.patch
new file mode 100644
index 0000000000..45bb95d4ee
--- /dev/null
+++ b/package/mac80211/patches/529-ath9k_ani_overflow_fix.patch
@@ -0,0 +1,11 @@
+--- a/drivers/net/wireless/ath/ath9k/ani.c
++++ b/drivers/net/wireless/ath/ath9k/ani.c
+@@ -664,7 +664,7 @@ static bool ath9k_hw_ani_read_counters(s
+ phyCnt1 = REG_READ(ah, AR_PHY_ERR_1);
+ phyCnt2 = REG_READ(ah, AR_PHY_ERR_2);
+
+- if (use_new_ani(ah) && (phyCnt1 < ofdm_base || phyCnt2 < cck_base)) {
++ if (!use_new_ani(ah) && (phyCnt1 < ofdm_base || phyCnt2 < cck_base)) {
+ if (phyCnt1 < ofdm_base) {
+ ath_print(common, ATH_DBG_ANI,
+ "phyCnt1 0x%x, resetting "
diff --git a/package/mac80211/patches/530-ath9k_cycle_counter_lock_fix.patch b/package/mac80211/patches/530-ath9k_cycle_counter_lock_fix.patch
new file mode 100644
index 0000000000..9f284df2cc
--- /dev/null
+++ b/package/mac80211/patches/530-ath9k_cycle_counter_lock_fix.patch
@@ -0,0 +1,12 @@
+--- a/drivers/net/wireless/ath/ath9k/main.c
++++ b/drivers/net/wireless/ath/ath9k/main.c
+@@ -780,7 +780,9 @@ irqreturn_t ath_isr(int irq, void *dev)
+ * it will clear whatever condition caused
+ * the interrupt.
+ */
++ spin_lock(&common->cc_lock);
+ ath9k_hw_proc_mib_event(ah);
++ spin_unlock(&common->cc_lock);
+ ath9k_hw_set_interrupts(ah, ah->imask);
+ }
+