Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 94ae77ea authored by Mohammed Shafi Shajakhan's avatar Mohammed Shafi Shajakhan Committed by John W. Linville
Browse files

ath9k: Fix BTCOEX timer triggering comparision 



Its more correct to convert btcoex_period to 'us' while
comparing with btcoex_no_stomp which is in 'us'.
Did not find any functionality issues being fixed,
as the generic hardware timer triggers are usually
refreshed with the newer duty cycle.

Cc: Rajkumar Manoharan <rmanohar@qca.qualcomm.com>
Signed-off-by: default avatarMohammed Shafi Shajakhan <mohammed@qca.qualcomm.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 90be994c

drivers/net/wireless/ath/ath9k/ath9k.h

+1 −1
Original line number Diff line number Diff line
@@ -473,7 +473,7 @@ struct ath_btcoex { 
	unsigned long op_flags;

	int bt_stomp_type; /* Types of BT stomping */

	u32 btcoex_no_stomp; /* in usec */

	u32 btcoex_period; /* in usec */

	u32 btcoex_period; /* in msec */

	u32 btscan_no_stomp; /* in usec */

	u32 duty_cycle;

	u32 bt_wait_time;

drivers/net/wireless/ath/ath9k/gpio.c

+6 −1
Original line number Diff line number Diff line
@@ -228,7 +228,12 @@ static void ath_btcoex_period_timer(unsigned long data) 
	ath9k_hw_btcoex_enable(ah);

	spin_unlock_bh(&btcoex->btcoex_lock);



	if (btcoex->btcoex_period != btcoex->btcoex_no_stomp) {

	/*

	 * btcoex_period is in msec while (btocex/btscan_)no_stomp are in usec,

	 * ensure that we properly convert btcoex_period to usec

	 * for any comparision with (btcoex/btscan_)no_stomp.

	 */

	if (btcoex->btcoex_period * 1000 != btcoex->btcoex_no_stomp) {

		if (btcoex->hw_timer_enabled)

			ath9k_gen_timer_stop(ah, btcoex->no_stomp_timer);