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>

diff --git a/drivers/net/wireless/iwlwifi/mvm/bt-coex.c b/drivers/net/wireless/iwlwifi/mvm/bt-coex.c
index 1700232aa1665d6eb1fe18acbc095826a818d3d0..1ad68f9d6adbda7b027478887cbb0e39d8ab36be 100644 (file)
--- 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 |