diff options
author | Luis R. Rodriguez <lrodriguez@atheros.com> | 2009-09-09 18:15:55 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-10-07 16:39:23 -0400 |
commit | 5e1972929532bfc3a26b1782c8551d3c56306ffd (patch) | |
tree | 2135a76e062d88737f860eb213be9017997919ad /drivers/net/wireless/ath/ath9k/main.c | |
parent | 269ad8120b2e1f01a7bcea4bdb175142a0e62171 (diff) |
ath9k: now move ath9k_hw_btcoex_set_weight() to btcoex.c
After some necessary cleanups we now move ath9k_hw_btcoex_set_weight()
to where it belongs.
Signed-off-by: Luis R. Rodriguez <lrodriguez@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 | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c index 0788a2724416..42772d25491a 100644 --- a/drivers/net/wireless/ath/ath9k/main.c +++ b/drivers/net/wireless/ath/ath9k/main.c | |||
@@ -1332,21 +1332,6 @@ static void ath_detect_bt_priority(struct ath_softc *sc) | |||
1332 | } | 1332 | } |
1333 | } | 1333 | } |
1334 | 1334 | ||
1335 | static void ath9k_hw_btcoex_set_weight(struct ath_hw *ah, | ||
1336 | u32 bt_weight, | ||
1337 | u32 wlan_weight) | ||
1338 | { | ||
1339 | struct ath_btcoex_hw *btcoex_hw = &ah->btcoex_hw; | ||
1340 | |||
1341 | btcoex_hw->bt_coex_weights = SM(bt_weight, AR_BTCOEX_BT_WGHT) | | ||
1342 | SM(wlan_weight, AR_BTCOEX_WL_WGHT); | ||
1343 | } | ||
1344 | |||
1345 | static void ath9k_hw_btcoex_init_weight(struct ath_hw *ah) | ||
1346 | { | ||
1347 | ath9k_hw_btcoex_set_weight(ah, AR_BT_COEX_WGHT, AR_STOMP_LOW_WLAN_WGHT); | ||
1348 | } | ||
1349 | |||
1350 | /* | 1335 | /* |
1351 | * Configures appropriate weight based on stomp type. | 1336 | * Configures appropriate weight based on stomp type. |
1352 | */ | 1337 | */ |
@@ -2200,7 +2185,8 @@ static int ath9k_start(struct ieee80211_hw *hw) | |||
2200 | 2185 | ||
2201 | if ((ah->btcoex_hw.scheme != ATH_BTCOEX_CFG_NONE) && | 2186 | if ((ah->btcoex_hw.scheme != ATH_BTCOEX_CFG_NONE) && |
2202 | !ah->btcoex_hw.enabled) { | 2187 | !ah->btcoex_hw.enabled) { |
2203 | ath9k_hw_btcoex_init_weight(ah); | 2188 | ath9k_hw_btcoex_set_weight(ah, AR_BT_COEX_WGHT, |
2189 | AR_STOMP_LOW_WLAN_WGHT); | ||
2204 | ath9k_hw_btcoex_enable(ah); | 2190 | ath9k_hw_btcoex_enable(ah); |
2205 | 2191 | ||
2206 | ath_pcie_aspm_disable(sc); | 2192 | ath_pcie_aspm_disable(sc); |