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

Commit 8f5dcb1c authored by Vasanthakumar Thiagarajan's avatar Vasanthakumar Thiagarajan Committed by John W. Linville
Browse files

ath9k: Reintroduce modparam to enable btcoex 



It is not ideal to enable btcoex based on subsys id as it is
not unique, they are so random. It is also a pain keeping
all of them in a table to enable btcoex for a particular
hw. Going back to the old idea.

Signed-off-by: default avatarVasanthakumar Thiagarajan <vasanth@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f30221e4

drivers/net/wireless/ath/ath.h

+2 −0
Original line number Diff line number Diff line
@@ -168,6 +168,8 @@ struct ath_common { 
	struct ath_regulatory regulatory;

	const struct ath_ops *ops;

	const struct ath_bus_ops *bus_ops;



	bool btcoex_enabled;

};



struct sk_buff *ath_rxbuf_alloc(struct ath_common *common,

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

+1 −2
Original line number Diff line number Diff line
@@ -1925,8 +1925,7 @@ int ath9k_hw_fill_cap_info(struct ath_hw *ah) 
	pCap->num_antcfg_2ghz =

		ah->eep_ops->get_num_ant_config(ah, ATH9K_HAL_FREQ_BAND_2GHZ);



	if (AR_SREV_9280_20_OR_LATER(ah) &&

	    ath9k_hw_btcoex_supported(ah)) {

	if (AR_SREV_9280_20_OR_LATER(ah) && common->btcoex_enabled) {

		btcoex_hw->btactive_gpio = ATH_BTACTIVE_GPIO;

		btcoex_hw->wlanactive_gpio = ATH_WLANACTIVE_GPIO;

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

+5 −0
Original line number Diff line number Diff line
@@ -38,6 +38,10 @@ int led_blink; 
module_param_named(blink, led_blink, int, 0444);

MODULE_PARM_DESC(blink, "Enable LED blink on activity");



static int ath9k_btcoex_enable;

module_param_named(btcoex_enable, ath9k_btcoex_enable, int, 0444);

MODULE_PARM_DESC(btcoex_enable, "Enable wifi-BT coexistence");



/* We use the hw_value as an index into our private channel structure */



#define CHAN2G(_freq, _idx)  { \
@@ -543,6 +547,7 @@ static int ath9k_init_softc(u16 devid, struct ath_softc *sc, u16 subsysid, 
	common->hw = sc->hw;

	common->priv = sc;

	common->debug_mask = ath9k_debug;

	common->btcoex_enabled = ath9k_btcoex_enable == 1;

	spin_lock_init(&common->cc_lock);



	spin_lock_init(&sc->wiphy_lock);