summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorBruno Randolf2010-05-19 03:31:05 +0200
committerJohn W. Linville2010-06-02 22:13:23 +0200
commit0e8e02dddc528f1c650ba13bb3b61e818c39dd2f (patch)
treec29a2c6f9932358831caf1efb452a64894690c4d /drivers
parentath5k: move noise floor calibration into tasklet (diff)
downloadkernel-qcow2-linux-0e8e02dddc528f1c650ba13bb3b61e818c39dd2f.tar.gz
kernel-qcow2-linux-0e8e02dddc528f1c650ba13bb3b61e818c39dd2f.tar.xz
kernel-qcow2-linux-0e8e02dddc528f1c650ba13bb3b61e818c39dd2f.zip
ath5k: Stop queues only for NF calibration
As far as we know, only NF calibration interferes with RX/TX so we can leave the queues enabled for the other calibrations. BTW: Stopping the queues is not enough for avoiding transmissions, since there might be packets in the queue + beacons are also sent regularly! But i leave it like this until we have a better solution (stopping TX DMA?). Signed-off-by: Bruno Randolf <br1@einfach.org> Acked-by: Nick Kossifidis <mickflemm@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/ath/ath5k/base.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c
index 3d854f0853ac..78a0c420c494 100644
--- a/drivers/net/wireless/ath/ath5k/base.c
+++ b/drivers/net/wireless/ath/ath5k/base.c
@@ -2786,10 +2786,6 @@ ath5k_tasklet_calibrate(unsigned long data)
/* Only full calibration for now */
ah->ah_cal_mask |= AR5K_CALIBRATION_FULL;
- /* Stop queues so that calibration
- * doesn't interfere with tx */
- ieee80211_stop_queues(sc->hw);
-
ATH5K_DBG(sc, ATH5K_DEBUG_CALIBRATE, "channel %u/%x\n",
ieee80211_frequency_to_channel(sc->curchan->center_freq),
sc->curchan->hw_value);
@@ -2807,8 +2803,13 @@ ath5k_tasklet_calibrate(unsigned long data)
ieee80211_frequency_to_channel(
sc->curchan->center_freq));
+ /* TODO: We don't need to run noise floor calibration as often
+ * as I/Q calibration.*/
+
+ /* Noise floor calibration interrupts rx/tx path while I/Q calibration
+ * doesn't. Stop queues so that calibration doesn't interfere with tx */
+ ieee80211_stop_queues(sc->hw);
ath5k_hw_update_noise_floor(ah);
- /* Wake queues */
ieee80211_wake_queues(sc->hw);
ah->ah_cal_mask &= ~AR5K_CALIBRATION_FULL;