d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

I noticed that the Merlin NICs I had (AR9220, AR9280) never completed

Browse Source 
the ADC calibrations if the NIC is in 5ghz 11a or 5ghz HT/20 modes.
I've been told that the dual-ADC is only engaged in turbo/40mhz modes.

Since Sowl (AR9160) seems to return valid-looking calibration data
in 5ghz 20MHz modes, I'm only disabling it for Merlin for now.
It may turn out I can disable it for all chipsets and only enable
it for 40MHz modes.

Approved by:	re (kib)
This commit is contained in:
Adrian Chadd 2011-07-30 13:21:33 +00:00
parent 827660cf9a
commit c86c3aa3d9
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/dev/ath/ath_hal/ar5416/ar5416_cal.c
View File

@ -73,8 +73,15 @@ ar5416IsCalSupp(struct ath_hal *ah, const struct ieee80211_channel *chan,
case ADC_GAIN_CAL:
case ADC_DC_CAL:
/* Run ADC Gain Cal for either 5ghz any or 2ghz HT40 */
if (IEEE80211_IS_CHAN_5GHZ(chan))
return AH_TRUE;
/*
* Merlin (AR9280) doesn't ever complete ADC calibrations
* in 5ghz non-HT40 mode (ie, HT20, 11a). For now, disable
* it for Merlin only until further information is
* available.
*/
if (! AR_SREV_MERLIN(ah))
if (IEEE80211_IS_CHAN_5GHZ(chan))
return AH_TRUE;
if (IEEE80211_IS_CHAN_HT40(chan))
return AH_TRUE;
return AH_FALSE;