Netdev List
 help / color / mirror / Atom feed
* [PATCH] ath9k: turn on btcoex_enable as default
@ 2018-02-08  5:28 Kai-Heng Feng
  2018-02-08 11:02 ` Felix Fietkau
  0 siblings, 1 reply; 10+ messages in thread
From: Kai-Heng Feng @ 2018-02-08  5:28 UTC (permalink / raw)
  To: kvalo; +Cc: ath9k-devel, linux-wireless, netdev, linux-kernel, Kai-Heng Feng

Without btcoex_enable, WiFi activies make both WiFi and Bluetooth
unstable if there's a bluetooth connection.

Enable this option when bt_ant_diversity is disabled.

BugLink: https://bugs.launchpad.net/bugs/1746164
Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
---
 drivers/net/wireless/ath/ath9k/init.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c
index e479fae5aab9..f8f6b091a077 100644
--- a/drivers/net/wireless/ath/ath9k/init.c
+++ b/drivers/net/wireless/ath/ath9k/init.c
@@ -56,7 +56,7 @@ static int ath9k_led_active_high = -1;
 module_param_named(led_active_high, ath9k_led_active_high, int, 0444);
 MODULE_PARM_DESC(led_active_high, "Invert LED polarity");
 
-static int ath9k_btcoex_enable;
+static int ath9k_btcoex_enable = 1;
 module_param_named(btcoex_enable, ath9k_btcoex_enable, int, 0444);
 MODULE_PARM_DESC(btcoex_enable, "Enable wifi-BT coexistence");
 
@@ -693,7 +693,6 @@ static int ath9k_init_softc(u16 devid, struct ath_softc *sc,
 	common->hw = sc->hw;
 	common->priv = sc;
 	common->debug_mask = ath9k_debug;
-	common->btcoex_enabled = ath9k_btcoex_enable == 1;
 	common->disable_ani = false;
 
 	/*
@@ -715,14 +714,17 @@ static int ath9k_init_softc(u16 devid, struct ath_softc *sc,
 	/*
 	 * Enable WLAN/BT RX Antenna diversity only when:
 	 *
-	 * - BTCOEX is disabled.
 	 * - the user manually requests the feature.
 	 * - the HW cap is set using the platform data.
 	 */
-	if (!common->btcoex_enabled && ath9k_bt_ant_diversity &&
+	if (ath9k_bt_ant_diversity &&
 	    (pCap->hw_caps & ATH9K_HW_CAP_BT_ANT_DIV))
 		common->bt_ant_diversity = 1;
 
+	/* Enable btcoex when ant_diversity is disabled */
+	if (!common->bt_ant_diversity && ath9k_btcoex_enable)
+		common->btcoex_enabled = 1;
+
 	spin_lock_init(&common->cc_lock);
 	spin_lock_init(&sc->intr_lock);
 	spin_lock_init(&sc->sc_serial_rw);
-- 
2.15.1

^ permalink raw reply related	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2018-08-23 17:06 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-02-08  5:28 [PATCH] ath9k: turn on btcoex_enable as default Kai-Heng Feng
2018-02-08 11:02 ` Felix Fietkau
     [not found]   ` <56d650e6-d26f-087c-4e86-2e5d4e859414-Vt+b4OUoWG0@public.gmane.org>
2018-02-09  4:21     ` Kai Heng Feng
2018-02-09  7:16       ` Kalle Valo
     [not found]         ` <87k1vmeip8.fsf-HodKDYzPHsUD5k0oWYwrnHL1okKdlPRT@public.gmane.org>
2018-02-10 13:56           ` Kai Heng Feng
2018-02-10 14:05             ` Felix Fietkau
2018-02-12  4:15               ` Kai Heng Feng
2018-08-23  1:33                 ` Kai-Heng Feng
2018-08-23 11:18                   ` Kalle Valo
2018-08-23 17:06                     ` Tom Psyborg

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox