diff options
| author | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2011-06-03 13:52:38 -0700 |
|---|---|---|
| committer | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2011-06-11 07:08:39 -0700 |
| commit | b60eec9bf07307ad40e9304d39eb9107acb2fb0c (patch) | |
| tree | 90d2f844f74bdf7c6f40da2619b33c656189a97d /drivers/net/wireless/iwlwifi/iwl-agn-lib.c | |
| parent | eb64dca0c9d73e191026ed37d1075f22e48b3f1c (diff) | |
| download | talos-obmc-linux-b60eec9bf07307ad40e9304d39eb9107acb2fb0c.tar.gz talos-obmc-linux-b60eec9bf07307ad40e9304d39eb9107acb2fb0c.zip | |
iwlagn: move bt_coex_active as part of iwlagn_mod_params
Move bt_coex_active module parameter into iwlagn_mod_params structure
along with all the other iwlagn module parameters
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn-lib.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c index 677f73c4c1e3..f0dacfbe8e98 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c @@ -622,6 +622,7 @@ struct iwl_mod_params iwlagn_mod_params = { .amsdu_size_8K = 1, .restart_fw = 1, .plcp_check = true, + .bt_coex_active = true, /* the rest are 0 by default */ }; @@ -1699,7 +1700,8 @@ void iwlagn_send_advance_bt_config(struct iwl_priv *priv) * (might be in monitor mode), or the interface is in * IBSS mode (no proper uCode support for coex then). */ - if (!bt_coex_active || priv->iw_mode == NL80211_IFTYPE_ADHOC) { + if (!iwlagn_mod_params.bt_coex_active || + priv->iw_mode == NL80211_IFTYPE_ADHOC) { basic.flags = IWLAGN_BT_FLAG_COEX_MODE_DISABLED; } else { basic.flags = IWLAGN_BT_FLAG_COEX_MODE_3W << |
