diff options
| author | David S. Miller <davem@davemloft.net> | 2012-03-28 06:15:01 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-03-28 06:15:01 +0400 |
| commit | 7dd30d447b7f4a129586cce8e57d0163dde876b0 (patch) | |
| tree | f6a3c26bccbd31e144c8c68fda979988739d4af5 /drivers/net/wireless/ath/ath9k/calib.c | |
| parent | de8856d2c11f562c60ed9340a83db4a4f829a6e6 (diff) | |
| parent | 643c61e119459e9d750087b7b34be94491efebf9 (diff) | |
| download | linux-7dd30d447b7f4a129586cce8e57d0163dde876b0.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/calib.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/calib.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/wireless/ath/ath9k/calib.c b/drivers/net/wireless/ath/ath9k/calib.c index 2f4b48e6fb03..e5cceb077574 100644 --- a/drivers/net/wireless/ath/ath9k/calib.c +++ b/drivers/net/wireless/ath/ath9k/calib.c @@ -20,7 +20,6 @@ /* Common calibration code */ -#define ATH9K_NF_TOO_HIGH -60 static int16_t ath9k_hw_get_nf_hist_mid(int16_t *nfCalBuffer) { @@ -346,10 +345,10 @@ static void ath9k_hw_nf_sanitize(struct ath_hw *ah, s16 *nf) "NF calibrated [%s] [chain %d] is %d\n", (i >= 3 ? "ext" : "ctl"), i % 3, nf[i]); - if (nf[i] > ATH9K_NF_TOO_HIGH) { + if (nf[i] > limit->max) { ath_dbg(common, CALIBRATE, "NF[%d] (%d) > MAX (%d), correcting to MAX\n", - i, nf[i], ATH9K_NF_TOO_HIGH); + i, nf[i], limit->max); nf[i] = limit->max; } else if (nf[i] < limit->min) { ath_dbg(common, CALIBRATE, |