Author: nbd Date: 2014-06-12 13:41:08 +0200 (Thu, 12 Jun 2014) New Revision: 41155
Added: trunk/package/kernel/mac80211/patches/566-ath9k_nfcal_xor_percal.patch Log: ath9k: make noise floor calibration and periodic calibration mutually exclusive Signed-off-by: Felix Fietkau <[email protected]> Added: trunk/package/kernel/mac80211/patches/566-ath9k_nfcal_xor_percal.patch =================================================================== --- trunk/package/kernel/mac80211/patches/566-ath9k_nfcal_xor_percal.patch (rev 0) +++ trunk/package/kernel/mac80211/patches/566-ath9k_nfcal_xor_percal.patch 2014-06-12 11:41:08 UTC (rev 41155) @@ -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 */ _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
