diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-12-18 22:17:34 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-12-18 22:17:34 +0000 |
| commit | d1dc8042291e8eb0f23f244d920ba196fb120e3d (patch) | |
| tree | 89e66c29619490702e8b34a263db7f661f4f3dbd /package | |
| parent | c0f6abcdc68f495da09fbef42d8c734e4aa056db (diff) | |
ath9k: fix some issues in the btcoex disable patch
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29564 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
| -rw-r--r-- | package/mac80211/patches/571-ath9k_btcoex_optional.patch | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/package/mac80211/patches/571-ath9k_btcoex_optional.patch b/package/mac80211/patches/571-ath9k_btcoex_optional.patch index 53448880a..c73ad1a4f 100644 --- a/package/mac80211/patches/571-ath9k_btcoex_optional.patch +++ b/package/mac80211/patches/571-ath9k_btcoex_optional.patch @@ -29,11 +29,9 @@ }; struct ath9k_hw_capabilities { ---- a/drivers/net/wireless/ath/ath9k/btcoex.h -+++ b/drivers/net/wireless/ath/ath9k/btcoex.h -@@ -98,6 +98,16 @@ struct ath_btcoex_hw { - u32 wlan_weight[AR9300_NUM_WLAN_WEIGHTS]; - }; +@@ -1229,6 +1233,16 @@ void ar9003_mci_sync_bt_state(struct ath + void ar9003_mci_get_interrupt(struct ath_hw *ah, u32 *raw_intr, + u32 *rx_msg_intr); +#ifdef CONFIG_ATH9K_BTCOEX_SUPPORT +static inline enum ath_btcoex_scheme @@ -45,9 +43,9 @@ +#define ath9k_hw_get_btcoex_scheme(...) ATH_BTCOEX_CFG_NONE +#endif + - void ath9k_hw_btcoex_init_2wire(struct ath_hw *ah); - void ath9k_hw_btcoex_init_3wire(struct ath_hw *ah); - void ath9k_hw_init_btcoex_hw(struct ath_hw *ah, int qnum); + #define ATH9K_CLOCK_RATE_CCK 22 + #define ATH9K_CLOCK_RATE_5GHZ_OFDM 40 + #define ATH9K_CLOCK_RATE_2GHZ_OFDM 44 --- a/drivers/net/wireless/ath/ath9k/init.c +++ b/drivers/net/wireless/ath/ath9k/init.c @@ -411,7 +411,7 @@ static int ath9k_init_btcoex(struct ath_ @@ -221,7 +219,7 @@ { struct ath_btcoex *btcoex = &priv->btcoex; -+ if (ath9k_hw_get_btcoex_scheme(ah) == ATH_BTCOEX_CFG_NONE) ++ if (ath9k_hw_get_btcoex_scheme(priv->ah) == ATH_BTCOEX_CFG_NONE) + return; + btcoex->btcoex_period = ATH_BTCOEX_DEF_BT_PERIOD; @@ -241,7 +239,7 @@ */ void ath_htc_cancel_btcoex_work(struct ath9k_htc_priv *priv) { -+ if (ath9k_hw_get_btcoex_scheme(ah) == ATH_BTCOEX_CFG_NONE) ++ if (ath9k_hw_get_btcoex_scheme(priv->ah) == ATH_BTCOEX_CFG_NONE) + return; + cancel_delayed_work_sync(&priv->coex_period_work); |