Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bc53cd49 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by Johannes Berg
Browse files

iwlwifi: remove bt_ch_announce module param 



This parameter is really not useful, remove it.
Leave the variable in priv in case someone wants
to play with it.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent b0114714

drivers/net/wireless/iwlwifi/dvm/main.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -1355,8 +1355,8 @@ static struct iwl_op_mode *iwl_op_mode_dvm_start(struct iwl_trans *trans, 
			IWL_BT_ANTENNA_COUPLING_THRESHOLD) ?

			IWL_BT_ANTENNA_COUPLING_THRESHOLD) ?

			true : false;

			true : false;





	/* enable/disable bt channel inhibition */

	/* bt channel inhibition enabled*/

	priv->bt_ch_announce = iwlwifi_mod_params.bt_ch_announce;

	priv->bt_ch_announce = true;

	IWL_DEBUG_INFO(priv, "BT channel inhibition is %s\n",

	IWL_DEBUG_INFO(priv, "BT channel inhibition is %s\n",

		       (priv->bt_ch_announce) ? "On" : "Off");

		       (priv->bt_ch_announce) ? "On" : "Off");

drivers/net/wireless/iwlwifi/iwl-drv.c

+0 −6
Original line number Original line Diff line number Diff line
@@ -1112,7 +1112,6 @@ struct iwl_mod_params iwlwifi_mod_params = { 
	.plcp_check = true,

	.plcp_check = true,

	.bt_coex_active = true,

	.bt_coex_active = true,

	.power_level = IWL_POWER_INDEX_1,

	.power_level = IWL_POWER_INDEX_1,

	.bt_ch_announce = true,

	.auto_agg = true,

	.auto_agg = true,

	.wd_disable = true,

	.wd_disable = true,

	/* the rest are 0 by default */

	/* the rest are 0 by default */
@@ -1221,11 +1220,6 @@ module_param_named(antenna_coupling, iwlwifi_mod_params.ant_coupling, 
MODULE_PARM_DESC(antenna_coupling,

MODULE_PARM_DESC(antenna_coupling,

		 "specify antenna coupling in dB (defualt: 0 dB)");

		 "specify antenna coupling in dB (defualt: 0 dB)");





module_param_named(bt_ch_inhibition, iwlwifi_mod_params.bt_ch_announce,

		   bool, S_IRUGO);

MODULE_PARM_DESC(bt_ch_inhibition,

		 "Enable BT channel inhibition (default: enable)");



module_param_named(plcp_check, iwlwifi_mod_params.plcp_check, bool, S_IRUGO);

module_param_named(plcp_check, iwlwifi_mod_params.plcp_check, bool, S_IRUGO);

MODULE_PARM_DESC(plcp_check, "Check plcp health (default: 1 [enabled])");

MODULE_PARM_DESC(plcp_check, "Check plcp health (default: 1 [enabled])");

drivers/net/wireless/iwlwifi/iwl-modparams.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -101,7 +101,6 @@ enum iwl_power_level { 
 * @power_level: power level, default = 1

 * @power_level: power level, default = 1

 * @debug_level: levels are IWL_DL_*

 * @debug_level: levels are IWL_DL_*

 * @ant_coupling: antenna coupling in dB, default = 0

 * @ant_coupling: antenna coupling in dB, default = 0

 * @bt_ch_announce: BT channel inhibition, default = enable

 * @auto_agg: enable agg. without check, default = true

 * @auto_agg: enable agg. without check, default = true

 */

 */

struct iwl_mod_params {

struct iwl_mod_params {
@@ -119,7 +118,6 @@ struct iwl_mod_params { 
	u32 debug_level;

	u32 debug_level;

#endif

#endif

	int ant_coupling;

	int ant_coupling;

	bool bt_ch_announce;

	bool auto_agg;

	bool auto_agg;

	char *nvm_file;

	char *nvm_file;

};

};