aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-06-12 11:41:08 +0000
committerFelix Fietkau <nbd@openwrt.org>2014-06-12 11:41:08 +0000
commitf3e37c359d5548ce1c50817fc689ea85a4f90476 (patch)
tree0da66c556929c8bea164c9ec149077d6e21ba1d7 /package/kernel
parentf2e5a82296b9edff2a8079d7c3c699889f851c78 (diff)
downloadupstream-f3e37c359d5548ce1c50817fc689ea85a4f90476.tar.gz
upstream-f3e37c359d5548ce1c50817fc689ea85a4f90476.tar.bz2
upstream-f3e37c359d5548ce1c50817fc689ea85a4f90476.zip
ath9k: make noise floor calibration and periodic calibration mutually exclusive
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 41155
Diffstat (limited to 'package/kernel')
-rw-r--r--package/kernel/mac80211/patches/566-ath9k_nfcal_xor_percal.patch42
1 files changed, 42 insertions, 0 deletions
diff --git a/package/kernel/mac80211/patches/566-ath9k_nfcal_xor_percal.patch b/package/kernel/mac80211/patches/566-ath9k_nfcal_xor_percal.patch
new file mode 100644
index 0000000000..917bc2d946
--- /dev/null
+++ b/package/kernel/mac80211/patches/566-ath9k_nfcal_xor_percal.patch
@@ -0,0 +1,42 @@
+--- a/drivers/net/wireless/ath/ath9k/ar9002_calib.c
++++ b/drivers/net/wireless/ath/ath9k/ar9002_calib.c
+@@ -660,7 +660,6 @@ static void ar9002_hw_olc_temp_compensat
+ static int ar9002_hw_calibrate(struct ath_hw *ah, struct ath9k_channel *chan,
+ u8 rxchainmask, bool longcal)
+ {
+- bool iscaldone = true;
+ struct ath9k_cal_list *currCal = ah->cal_list_curr;
+ bool nfcal, nfcal_pending = false;
+ int ret;
+@@ -672,15 +671,13 @@ static int ar9002_hw_calibrate(struct at
+ if (currCal && !nfcal &&
+ (currCal->calState == CAL_RUNNING ||
+ currCal->calState == CAL_WAITING)) {
+- iscaldone = ar9002_hw_per_calibration(ah, chan,
+- rxchainmask, currCal);
+- if (iscaldone) {
+- ah->cal_list_curr = currCal = currCal->calNext;
+-
+- if (currCal->calState == CAL_WAITING) {
+- iscaldone = false;
+- ath9k_hw_reset_calibration(ah, currCal);
+- }
++ if (!ar9002_hw_per_calibration(ah, chan, rxchainmask, currCal))
++ return 0;
++
++ ah->cal_list_curr = currCal = currCal->calNext;
++ if (currCal->calState == CAL_WAITING) {
++ ath9k_hw_reset_calibration(ah, currCal);
++ return 0;
+ }
+ }
+
+@@ -710,7 +707,7 @@ static int ar9002_hw_calibrate(struct at
+ }
+ }
+
+- return iscaldone;
++ return 1;
+ }
+
+ /* Carrier leakage Calibration fix */