]> Pileus Git - ~andy/linux/commitdiff
ath9k: remove a redundant call to ath9k_hw_gettsf32
authorFelix Fietkau <nbd@openwrt.org>
Fri, 15 Oct 2010 18:03:32 +0000 (20:03 +0200)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 9 Nov 2010 21:13:25 +0000 (16:13 -0500)
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>
drivers/net/wireless/ath/ath9k/gpio.c

index db9c6fed799c5cf7d39ac4ceb644b265d1a9ade0..6a1a482f9dc30e2cacabe971186b630d5bc0c294 100644 (file)
@@ -310,10 +310,8 @@ static void ath_btcoex_period_timer(unsigned long data)
 
                timer_period = is_btscan ? btcoex->btscan_no_stomp :
                                           btcoex->btcoex_no_stomp;
-               ath9k_gen_timer_start(ah,
-                                     btcoex->no_stomp_timer,
-                                     (ath9k_hw_gettsf32(ah) +
-                                      timer_period), timer_period * 10);
+               ath9k_gen_timer_start(ah, btcoex->no_stomp_timer, 0,
+                                     timer_period * 10);
                btcoex->hw_timer_enabled = true;
        }