diff options
author | Vasanthakumar Thiagarajan <vasanth@atheros.com> | 2009-01-10 06:37:09 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-01-29 16:00:21 -0500 |
commit | 138ab2e44e99a9544aad60cf137b8ac1f54131c5 (patch) | |
tree | c6b4372efd60b6ff2a4a24b336421ab3c2ea7d5a /drivers/net/wireless/ath9k/hw.c | |
parent | 217875a37d4db3354c4c297d07b359abbf52e5e1 (diff) |
ath9k: Fix basic connectivity issue
This patch temporarily fixes a regression introduced by BT coexistence support.
There is an instability in connection when BT coexistence is enabled on some h/w.
This interim fix introduces a module parameter for BT coexistence configuration.
Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath9k/hw.c')
-rw-r--r-- | drivers/net/wireless/ath9k/hw.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath9k/hw.c b/drivers/net/wireless/ath9k/hw.c index e9a3951996e2..55ed0830588b 100644 --- a/drivers/net/wireless/ath9k/hw.c +++ b/drivers/net/wireless/ath9k/hw.c | |||
@@ -23,6 +23,10 @@ | |||
23 | #include "phy.h" | 23 | #include "phy.h" |
24 | #include "initvals.h" | 24 | #include "initvals.h" |
25 | 25 | ||
26 | static int btcoex_enable; | ||
27 | module_param(btcoex_enable, bool, 0); | ||
28 | MODULE_PARM_DESC(btcoex_enable, "Enable Bluetooth coexistence support"); | ||
29 | |||
26 | #define ATH9K_CLOCK_RATE_CCK 22 | 30 | #define ATH9K_CLOCK_RATE_CCK 22 |
27 | #define ATH9K_CLOCK_RATE_5GHZ_OFDM 40 | 31 | #define ATH9K_CLOCK_RATE_5GHZ_OFDM 40 |
28 | #define ATH9K_CLOCK_RATE_2GHZ_OFDM 44 | 32 | #define ATH9K_CLOCK_RATE_2GHZ_OFDM 44 |
@@ -3358,7 +3362,7 @@ bool ath9k_hw_fill_cap_info(struct ath_hal *ah) | |||
3358 | pCap->num_antcfg_2ghz = | 3362 | pCap->num_antcfg_2ghz = |
3359 | ath9k_hw_get_num_ant_config(ah, ATH9K_HAL_FREQ_BAND_2GHZ); | 3363 | ath9k_hw_get_num_ant_config(ah, ATH9K_HAL_FREQ_BAND_2GHZ); |
3360 | 3364 | ||
3361 | if (AR_SREV_9280_10_OR_LATER(ah)) { | 3365 | if (AR_SREV_9280_10_OR_LATER(ah) && btcoex_enable) { |
3362 | pCap->hw_caps |= ATH9K_HW_CAP_BT_COEX; | 3366 | pCap->hw_caps |= ATH9K_HW_CAP_BT_COEX; |
3363 | ah->ah_btactive_gpio = 6; | 3367 | ah->ah_btactive_gpio = 6; |
3364 | ah->ah_wlanactive_gpio = 5; | 3368 | ah->ah_wlanactive_gpio = 5; |