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

Commit 6de4902e authored by Paul Bolle's avatar Paul Bolle Committed by Johannes Berg
Browse files

iwlwifi: fix typo 'IWL_WATCHHDOG_DISABLED' 



Commit 7c5ba4a8 ("iwlwifi: move queue
watchdog into transport") introduced the named constant
'IWL_WATCHHDOG_DISABLED'. Rename it to 'IWL_WATCHDOG_DISABLED'.

Signed-off-by: default avatarPaul Bolle <pebolle@tiscali.nl>
Reviewed-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 26a7ca9a

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

+1 −1
Original line number Diff line number Diff line
@@ -1347,7 +1347,7 @@ static struct iwl_op_mode *iwl_op_mode_dvm_start(struct iwl_trans *trans, 
		trans_cfg.queue_watchdog_timeout =

			priv->cfg->base_params->wd_timeout;

	else

		trans_cfg.queue_watchdog_timeout = IWL_WATCHHDOG_DISABLED;

		trans_cfg.queue_watchdog_timeout = IWL_WATCHDOG_DISABLED;

	trans_cfg.command_names = iwl_dvm_cmd_strings;



	ucode_flags = fw->ucode_capa.flags;

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

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ enum iwl_led_mode { 
#define IWL_MAX_PLCP_ERR_THRESHOLD_DISABLE	0



/* TX queue watchdog timeouts in mSecs */

#define IWL_WATCHHDOG_DISABLED	0

#define IWL_WATCHDOG_DISABLED	0

#define IWL_DEF_WD_TIMEOUT	2000

#define IWL_LONG_WD_TIMEOUT	10000

#define IWL_MAX_WD_TIMEOUT	120000

drivers/net/wireless/iwlwifi/pcie/1000.c

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ static const struct iwl_base_params iwl1000_base_params = { 
	.support_ct_kill_exit = true,

	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_EXT_LONG_THRESHOLD_DEF,

	.chain_noise_scale = 1000,

	.wd_timeout = IWL_WATCHHDOG_DISABLED,

	.wd_timeout = IWL_WATCHDOG_DISABLED,

	.max_event_log_size = 128,

};

drivers/net/wireless/iwlwifi/pcie/5000.c

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ static const struct iwl_base_params iwl5000_base_params = { 
	.led_compensation = 51,

	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF,

	.chain_noise_scale = 1000,

	.wd_timeout = IWL_WATCHHDOG_DISABLED,

	.wd_timeout = IWL_WATCHDOG_DISABLED,

	.max_event_log_size = 512,

	.no_idle_support = true,

};