diff options
author | Vasanthakumar Thiagarajan <vasanth@atheros.com> | 2009-08-26 11:38:47 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-08-28 14:40:50 -0400 |
commit | 22f25d0d5e146112d4ec464564ebb49a5b8a547b (patch) | |
tree | 31145930a77a642673dcebdf1b0c3f09485fed4c /drivers/net/wireless/ath/ath9k/main.c | |
parent | f14462c6661c6b9e91d436f7ab66b35ed52ea703 (diff) |
ath9k: Determine btcoex scheme type based on chip version
Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/main.c')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/main.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c index 878d3be7c717..8a2f000274b5 100644 --- a/drivers/net/wireless/ath/ath9k/main.c +++ b/drivers/net/wireless/ath/ath9k/main.c | |||
@@ -1509,7 +1509,8 @@ static int ath_init_softc(u16 devid, struct ath_softc *sc) | |||
1509 | ARRAY_SIZE(ath9k_5ghz_chantable); | 1509 | ARRAY_SIZE(ath9k_5ghz_chantable); |
1510 | } | 1510 | } |
1511 | 1511 | ||
1512 | if (ah->caps.hw_caps & ATH9K_HW_CAP_BT_COEX) | 1512 | if ((ah->caps.hw_caps & ATH9K_HW_CAP_BT_COEX) && |
1513 | (sc->btcoex_info.btcoex_scheme == ATH_BTCOEX_CFG_2WIRE)) | ||
1513 | ath9k_hw_btcoex_init(ah); | 1514 | ath9k_hw_btcoex_init(ah); |
1514 | 1515 | ||
1515 | return 0; | 1516 | return 0; |
@@ -1993,6 +1994,7 @@ static int ath9k_start(struct ieee80211_hw *hw) | |||
1993 | ieee80211_queue_delayed_work(sc->hw, &sc->tx_complete_work, 0); | 1994 | ieee80211_queue_delayed_work(sc->hw, &sc->tx_complete_work, 0); |
1994 | 1995 | ||
1995 | if ((sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_BT_COEX) && | 1996 | if ((sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_BT_COEX) && |
1997 | (sc->btcoex_info.btcoex_scheme == ATH_BTCOEX_CFG_2WIRE) && | ||
1996 | !(sc->sc_flags & SC_OP_BTCOEX_ENABLED)) | 1998 | !(sc->sc_flags & SC_OP_BTCOEX_ENABLED)) |
1997 | ath9k_hw_btcoex_enable(sc->sc_ah); | 1999 | ath9k_hw_btcoex_enable(sc->sc_ah); |
1998 | 2000 | ||