Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
ath5k: do not re-run AGC calibration periodically - fixes stability i…
…ssues on AR2315 (#10574) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30624 3c298f89-4303-0410-b956-a3cf2f4a3e73
- Loading branch information
nbd
committed
Feb 17, 2012
1 parent
cb64c40
commit 0a4428a
Showing
1 changed file
with
42 additions
and
0 deletions.
There are no files selected for viewing
42 changes: 42 additions & 0 deletions
42
package/mac80211/patches/441-ath5k_no_agc_recalibration.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| --- a/drivers/net/wireless/ath/ath5k/phy.c | ||
| +++ b/drivers/net/wireless/ath/ath5k/phy.c | ||
| @@ -1871,31 +1871,15 @@ ath5k_hw_phy_calibrate(struct ath5k_hw * | ||
| ret = 0; | ||
| } | ||
|
|
||
| - /* On full calibration do an AGC calibration and | ||
| - * request a PAPD probe for gainf calibration if | ||
| - * needed */ | ||
| - if (ah->ah_cal_mask & AR5K_CALIBRATION_FULL) { | ||
| + /* On full calibration request a PAPD probe for | ||
| + * gainf calibration if needed */ | ||
| + if ((ah->ah_cal_mask & AR5K_CALIBRATION_FULL) && | ||
| + (ah->ah_radio == AR5K_RF5111 || | ||
| + ah->ah_radio == AR5K_RF5112) && | ||
| + channel->hw_value != AR5K_MODE_11B) | ||
| + ath5k_hw_request_rfgain_probe(ah); | ||
|
|
||
| - AR5K_REG_ENABLE_BITS(ah, AR5K_PHY_AGCCTL, | ||
| - AR5K_PHY_AGCCTL_CAL); | ||
| - | ||
| - ret = ath5k_hw_register_timeout(ah, AR5K_PHY_AGCCTL, | ||
| - AR5K_PHY_AGCCTL_CAL | AR5K_PHY_AGCCTL_NF, | ||
| - 0, false); | ||
| - if (ret) { | ||
| - ATH5K_ERR(ah, | ||
| - "gain calibration timeout (%uMHz)\n", | ||
| - channel->center_freq); | ||
| - } | ||
| - | ||
| - if ((ah->ah_radio == AR5K_RF5111 || | ||
| - ah->ah_radio == AR5K_RF5112) | ||
| - && (channel->hw_value != AR5K_MODE_11B)) | ||
| - ath5k_hw_request_rfgain_probe(ah); | ||
| - } | ||
| - | ||
| - /* Update noise floor | ||
| - * XXX: Only do this after AGC calibration */ | ||
| + /* Update noise floor */ | ||
| if (!(ah->ah_cal_mask & AR5K_CALIBRATION_NF)) | ||
| ath5k_hw_update_noise_floor(ah); | ||
|
|