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

Commit 8b5bf335 authored Jun 18, 2013 by Emmanuel Grumbach Committed by Johannes Berg Jun 18, 2013

iwlwifi: remove plcp_check module parameter



Nobody will ever wants to run without this. Make it true always.

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

parent bc53cd49

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

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -335,8 +335,7 @@ static void iwlagn_recover_from_statistics(struct iwl_priv *priv,
	if (msecs < 99)		if (msecs < 99)
	return;		return;

	if (iwlwifi_mod_params.plcp_check &&		if (!iwlagn_good_plcp_health(priv, cur_ofdm, cur_ofdm_ht, msecs))
	!iwlagn_good_plcp_health(priv, cur_ofdm, cur_ofdm_ht, msecs))
	iwl_force_rf_reset(priv, false);		iwl_force_rf_reset(priv, false);
	}		}

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

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -1109,7 +1109,6 @@ void iwl_drv_stop(struct iwl_drv *drv)
	/* shared module parameters */		/* shared module parameters */
	struct iwl_mod_params iwlwifi_mod_params = {		struct iwl_mod_params iwlwifi_mod_params = {
	.restart_fw = true,		.restart_fw = true,
	.plcp_check = true,
	.bt_coex_active = true,		.bt_coex_active = true,
	.power_level = IWL_POWER_INDEX_1,		.power_level = IWL_POWER_INDEX_1,
	.auto_agg = true,		.auto_agg = true,
	@@ -1220,9 +1219,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(plcp_check, iwlwifi_mod_params.plcp_check, bool, S_IRUGO);
	MODULE_PARM_DESC(plcp_check, "Check plcp health (default: 1 [enabled])");

	module_param_named(wd_disable, iwlwifi_mod_params.wd_disable, int, S_IRUGO);		module_param_named(wd_disable, iwlwifi_mod_params.wd_disable, int, S_IRUGO);
	MODULE_PARM_DESC(wd_disable,		MODULE_PARM_DESC(wd_disable,
	"Disable stuck queue watchdog timer 0=system default, "		"Disable stuck queue watchdog timer 0=system default, "

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

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -93,7 +93,6 @@ enum iwl_power_level {
	* use IWL_DISABLE_HT_* constants		* use IWL_DISABLE_HT_* constants
	* @amsdu_size_8K: enable 8K amsdu size, default = 0		* @amsdu_size_8K: enable 8K amsdu size, default = 0
	* @restart_fw: restart firmware, default = 1		* @restart_fw: restart firmware, default = 1
	* @plcp_check: enable plcp health check, default = true
	* @wd_disable: enable stuck queue check, default = 0		* @wd_disable: enable stuck queue check, default = 0
	* @bt_coex_active: enable bt coex, default = true		* @bt_coex_active: enable bt coex, default = true
	* @led_mode: system default, default = 0		* @led_mode: system default, default = 0
	@@ -108,7 +107,6 @@ struct iwl_mod_params {
	unsigned int disable_11n;		unsigned int disable_11n;
	int amsdu_size_8K;		int amsdu_size_8K;
	bool restart_fw;		bool restart_fw;
	bool plcp_check;
	int wd_disable;		int wd_disable;
	bool bt_coex_active;		bool bt_coex_active;
	int led_mode;		int led_mode;