diff options
| author | Sujith | 2008-12-02 14:07:54 +0100 |
|---|---|---|
| committer | John W. Linville | 2008-12-05 15:35:50 +0100 |
| commit | aac9207e45b1ec1f36d67e57d94f59ac036d37ee (patch) | |
| tree | e10993bc20d89b4388e7f332532aee403d2cebdc /drivers/net/wireless/ath9k/main.c | |
| parent | iwlwifi: 5150 enable LO, TXIQ and BB calibrations (diff) | |
| download | kernel-qcow2-linux-aac9207e45b1ec1f36d67e57d94f59ac036d37ee.tar.gz kernel-qcow2-linux-aac9207e45b1ec1f36d67e57d94f59ac036d37ee.tar.xz kernel-qcow2-linux-aac9207e45b1ec1f36d67e57d94f59ac036d37ee.zip | |
ath9k: Choose correct ANI calibration period
ANI can't be turned on/off dynamically yet, but the calculation
of the calibration period is wrong anyway. This patch fixes it.
Reported-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Sujith <Sujith.Manoharan@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath9k/main.c')
| -rw-r--r-- | drivers/net/wireless/ath9k/main.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath9k/main.c b/drivers/net/wireless/ath9k/main.c index 3d7111e9b8d8..26c47577e183 100644 --- a/drivers/net/wireless/ath9k/main.c +++ b/drivers/net/wireless/ath9k/main.c @@ -421,8 +421,9 @@ static void ath_ani_calibrate(unsigned long data) * The interval must be the shortest necessary to satisfy ANI, * short calibration and long calibration. */ - - cal_interval = ATH_ANI_POLLINTERVAL; + cal_interval = ATH_LONG_CALINTERVAL; + if (sc->sc_ah->ah_config.enable_ani) + cal_interval = min(cal_interval, (u32)ATH_ANI_POLLINTERVAL); if (!sc->sc_ani.sc_caldone) cal_interval = min(cal_interval, (u32)ATH_SHORT_CALINTERVAL); |