aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2010-10-15 14:03:32 -0400
committerJohn W. Linville <linville@tuxdriver.com>2010-11-09 16:13:25 -0500
commit8eb1dabbd10e067cff671935d3e0c819f8e80d54 (patch)
tree236bc3b2cc7b2e91bb19a2603f788fe1d42984bf /drivers/net
parent9fa23e1741404207c414fad69212a8763c138bf0 (diff)
ath9k: remove a redundant call to ath9k_hw_gettsf32
When the timer_next argument to ath9k_gen_timer_start is behind the tsf value, tsf + timer_period is used, which is what ath_btcoex_period_timer was setting it to. Signed-off-by: Felix Fietkau <nbd@openwrt.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/ath/ath9k/gpio.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/wireless/ath/ath9k/gpio.c b/drivers/net/wireless/ath/ath9k/gpio.c
index db9c6fed799c..6a1a482f9dc3 100644
--- a/drivers/net/wireless/ath/ath9k/gpio.c
+++ b/drivers/net/wireless/ath/ath9k/gpio.c
@@ -310,10 +310,8 @@ static void ath_btcoex_period_timer(unsigned long data)
310 310
311 timer_period = is_btscan ? btcoex->btscan_no_stomp : 311 timer_period = is_btscan ? btcoex->btscan_no_stomp :
312 btcoex->btcoex_no_stomp; 312 btcoex->btcoex_no_stomp;
313 ath9k_gen_timer_start(ah, 313 ath9k_gen_timer_start(ah, btcoex->no_stomp_timer, 0,
314 btcoex->no_stomp_timer, 314 timer_period * 10);
315 (ath9k_hw_gettsf32(ah) +
316 timer_period), timer_period * 10);
317 btcoex->hw_timer_enabled = true; 315 btcoex->hw_timer_enabled = true;
318 } 316 }
319 317