summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi
diff options
context:
space:
mode:
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>2013-03-19 23:09:58 +0200
committerJohannes Berg <johannes.berg@intel.com>2013-03-26 10:32:37 +0100
commitcf69d757a84eb7cfe79ff24e9f0bc7087ffe1884 (patch)
treec1e2e7910a8ba5533369d581fb7fa7af894e8bf4 /drivers/net/wireless/iwlwifi
parente635c797b3b18ffbe4ef5db27971f48b661f03bd (diff)
downloadblackbird-op-linux-cf69d757a84eb7cfe79ff24e9f0bc7087ffe1884.tar.gz
blackbird-op-linux-cf69d757a84eb7cfe79ff24e9f0bc7087ffe1884.zip
iwlwifi: mvm: ignore bt_ch_announce module parameter
This module parameter isn't and won't be used. So ignore its value and set BT_CH_ANNOUNCE unconditionally. Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi')
-rw-r--r--drivers/net/wireless/iwlwifi/mvm/bt-coex.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/bt-coex.c b/drivers/net/wireless/iwlwifi/mvm/bt-coex.c
index 1700232aa166..1ad68f9d6adb 100644
--- a/drivers/net/wireless/iwlwifi/mvm/bt-coex.c
+++ b/drivers/net/wireless/iwlwifi/mvm/bt-coex.c
@@ -203,8 +203,7 @@ int iwl_send_bt_init_conf(struct iwl_mvm *mvm)
cmd.flags = iwlwifi_mod_params.bt_coex_active ?
BT_COEX_NW : BT_COEX_DISABLE;
- cmd.flags |= iwlwifi_mod_params.bt_ch_announce ? BT_CH_PRIMARY_EN : 0;
- cmd.flags |= BT_SYNC_2_BT_DISABLE;
+ cmd.flags |= BT_CH_PRIMARY_EN | BT_SYNC_2_BT_DISABLE;
cmd.valid_bit_msk = cpu_to_le16(BT_VALID_ENABLE |
BT_VALID_BT_PRIO_BOOST |
OpenPOWER on IntegriCloud