Author: adrian
Date: Sat May 14 04:17:16 2011
New Revision: 221876
URL: http://svn.freebsd.org/changeset/base/221876
Log:
Major fix: when doing open-loop TX power calibration, adjust
the correct CCK rates rather than adjusting the first handful.
This may have affected some AR9280 based NICs.
Minor fix: merlin check update
Modified:
head/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c
Modified: head/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c Sat May 14 04:05:23
2011 (r221875)
+++ head/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c Sat May 14 04:17:16
2011 (r221876)
@@ -1053,9 +1053,9 @@ ar5416SetTransmitPower(struct ath_hal *a
int cck_ofdm_delta = 2;
int i;
for (i = 0; i < N(adj); i++) {
- ratesArray[i] -= cck_ofdm_delta;
- if (ratesArray[i] < 0)
- ratesArray[i] = 0;
+ ratesArray[adj[i]] -= cck_ofdm_delta;
+ if (ratesArray[adj[i]] < 0)
+ ratesArray[adj[i]] = 0;
}
}
@@ -2430,7 +2430,7 @@ ar5416GetGainBoundariesAndPdadcs(struct
/* Find starting index for this pdGain */
if (i == 0) {
- if (AR_SREV_MERLIN_20_OR_LATER(ah))
+ if (AR_SREV_MERLIN_10_OR_LATER(ah))
ss = (int16_t)(0 - (minPwrT4[i] / 2));
else
ss = 0; /* for the first pdGain, start from index 0 */
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
