diff options
| author | Bruno Randolf | 2010-03-25 06:49:19 +0100 |
|---|---|---|
| committer | John W. Linville | 2010-03-31 20:39:09 +0200 |
| commit | 6a8a3f6b2ac02fb8542f2b36b0ecd9c48f7d9a7e (patch) | |
| tree | c59903366deb8d8517df9fa7d95da0d7b685d334 /drivers/net/wireless/ath/ath5k/base.c | |
| parent | ath5k: optimize ath5k_hw_calibration_poll (diff) | |
| download | kernel-qcow2-linux-6a8a3f6b2ac02fb8542f2b36b0ecd9c48f7d9a7e.tar.gz kernel-qcow2-linux-6a8a3f6b2ac02fb8542f2b36b0ecd9c48f7d9a7e.tar.xz kernel-qcow2-linux-6a8a3f6b2ac02fb8542f2b36b0ecd9c48f7d9a7e.zip | |
ath5k: move ath5k_hw_calibration_poll to base.c
It's not a phy related funtion; It has more to do with the interrupt handler
and tasklet scheduling, so it belongs to base.c.
Signed-off-by: Bruno Randolf <br1@einfach.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath5k/base.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath5k/base.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c index 539a6d5415fd..f60d84f9c55f 100644 --- a/drivers/net/wireless/ath/ath5k/base.c +++ b/drivers/net/wireless/ath/ath5k/base.c @@ -2625,6 +2625,19 @@ ath5k_stop_hw(struct ath5k_softc *sc) return ret; } +static void +ath5k_intr_calibration_poll(struct ath5k_hw *ah) +{ + if (time_is_before_eq_jiffies(ah->ah_cal_next_full)) { + ah->ah_cal_next_full = jiffies + + msecs_to_jiffies(ATH5K_TUNE_CALIBRATION_INTERVAL_FULL); + tasklet_schedule(&ah->ah_sc->calib); + } + /* we could use SWI to generate enough interrupts to meet our + * calibration interval requirements, if necessary: + * AR5K_REG_ENABLE_BITS(ah, AR5K_CR, AR5K_CR_SWI); */ +} + static irqreturn_t ath5k_intr(int irq, void *dev_id) { @@ -2689,7 +2702,7 @@ ath5k_intr(int irq, void *dev_id) if (unlikely(!counter)) ATH5K_WARN(sc, "too many interrupts, giving up for now\n"); - ath5k_hw_calibration_poll(ah); + ath5k_intr_calibration_poll(ah); return IRQ_HANDLED; } |