diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2014-10-18 17:38:59 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2014-10-18 17:38:59 +0000 |
| commit | f0d9e712e459332ec527802f7eaca104c47b14c2 (patch) | |
| tree | b03de3247dbdd3f785bda5318729be5ab75f5f95 /package/kernel/mac80211/patches/331-ath9k_hw-do-not-run-NF-and-periodic-calibration-at-t.patch | |
| parent | 6d3fd947e4aa0430f592e9e3b0eb6b78cbe21f7b (diff) | |
| download | upstream-f0d9e712e459332ec527802f7eaca104c47b14c2.tar.gz upstream-f0d9e712e459332ec527802f7eaca104c47b14c2.tar.bz2 upstream-f0d9e712e459332ec527802f7eaca104c47b14c2.zip | |
mac80211: update to 2014-10-08
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 42952
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 | 53 |
1 files changed, 53 insertions, 0 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 new file mode 100644 index 0000000000..1d841a7637 --- /dev/null +++ b/package/kernel/mac80211/patches/331-ath9k_hw-do-not-run-NF-and-periodic-calibration-at-t.patch @@ -0,0 +1,53 @@ +From: Felix Fietkau <nbd@openwrt.org> +Date: Sat, 18 Oct 2014 13:39:11 +0200 +Subject: [PATCH] ath9k_hw: do not run NF and periodic calibration at the + same time + +It can cause inconsistent calibration results or in some cases turn the +radio deaf. + +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 + 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 */ |