diff options
author | Felix Fietkau <nbd@openwrt.org> | 2014-10-25 14:45:22 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2014-10-25 14:45:22 +0000 |
commit | 78bd998e49120d309ddfce88de4b2df42bee2646 (patch) | |
tree | 935bd041668839c9a12f15892ffe46b0915fdedd /package/kernel/mac80211/patches/331-ath9k_hw-do-not-run-NF-and-periodic-calibration-at-t.patch | |
parent | a0d9489e8438190e171eaa33bcb455f88e80427e (diff) | |
download | master-31e0f0ae-78bd998e49120d309ddfce88de4b2df42bee2646.tar.gz master-31e0f0ae-78bd998e49120d309ddfce88de4b2df42bee2646.tar.bz2 master-31e0f0ae-78bd998e49120d309ddfce88de4b2df42bee2646.zip |
ath9k: add a few calibration related fixes
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 43058
Diffstat (limited to 'package/kernel/mac80211/patches/331-ath9k_hw-do-not-run-NF-and-periodic-calibration-at-t.patch')
-rw-r--r-- | package/kernel/mac80211/patches/331-ath9k_hw-do-not-run-NF-and-periodic-calibration-at-t.patch | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/package/kernel/mac80211/patches/331-ath9k_hw-do-not-run-NF-and-periodic-calibration-at-t.patch b/package/kernel/mac80211/patches/331-ath9k_hw-do-not-run-NF-and-periodic-calibration-at-t.patch index 1d841a7637..cd3c1d7800 100644 --- a/package/kernel/mac80211/patches/331-ath9k_hw-do-not-run-NF-and-periodic-calibration-at-t.patch +++ b/package/kernel/mac80211/patches/331-ath9k_hw-do-not-run-NF-and-periodic-calibration-at-t.patch @@ -11,18 +11,23 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> --- 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 +@@ -660,27 +660,26 @@ 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; +- bool nfcal, nfcal_pending = false; ++ bool nfcal, nfcal_pending = false, percal_pending; int ret; -@@ -672,15 +671,13 @@ static int ar9002_hw_calibrate(struct at - if (currCal && !nfcal && - (currCal->calState == CAL_RUNNING || - currCal->calState == CAL_WAITING)) { + + nfcal = !!(REG_READ(ah, AR_PHY_AGC_CONTROL) & AR_PHY_AGC_CONTROL_NF); + if (ah->caldata) + nfcal_pending = test_bit(NFCAL_PENDING, &ah->caldata->cal_flags); + +- if (currCal && !nfcal && +- (currCal->calState == CAL_RUNNING || +- currCal->calState == CAL_WAITING)) { - iscaldone = ar9002_hw_per_calibration(ah, chan, - rxchainmask, currCal); - if (iscaldone) { @@ -32,6 +37,11 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> - iscaldone = false; - ath9k_hw_reset_calibration(ah, currCal); - } ++ percal_pending = (currCal && ++ (currCal->calState == CAL_RUNNING || ++ currCal->calState == CAL_WAITING)); ++ ++ if (percal_pending && !nfcal) { + if (!ar9002_hw_per_calibration(ah, chan, rxchainmask, currCal)) + return 0; + @@ -42,12 +52,12 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> } } -@@ -710,7 +707,7 @@ static int ar9002_hw_calibrate(struct at +@@ -710,7 +709,7 @@ static int ar9002_hw_calibrate(struct at } } - return iscaldone; -+ return 1; ++ return !percal_pending; } /* Carrier leakage Calibration fix */ |