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

Commit e7a09438 authored Mar 06, 2012 by Johannes Berg Committed by John W. Linville Mar 07, 2012

iwlwifi: use watchdog timeout from hw_params



This is the version that can be modified, the
config params should be read-only.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

parent ab5c0f1f

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

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1340,7 +1340,7 @@ void iwl_bg_watchdog(unsigned long data)
	if (iwl_is_rfkill(priv->shrd))		if (iwl_is_rfkill(priv->shrd))
	return;		return;

	timeout = cfg(priv)->base_params->wd_timeout;		timeout = hw_params(priv).wd_timeout;
	if (timeout == 0)		if (timeout == 0)
	return;		return;

	@@ -1355,7 +1355,7 @@ void iwl_bg_watchdog(unsigned long data)

	void iwl_setup_watchdog(struct iwl_priv *priv)		void iwl_setup_watchdog(struct iwl_priv *priv)
	{		{
	unsigned int timeout = cfg(priv)->base_params->wd_timeout;		unsigned int timeout = hw_params(priv).wd_timeout;

	if (!iwlagn_mod_params.wd_disable) {		if (!iwlagn_mod_params.wd_disable) {
	/* use system default */		/* use system default */

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2368,7 +2368,7 @@ static ssize_t iwl_dbgfs_wd_timeout_write(struct file *file,
	if (timeout < 0 \|\| timeout > IWL_MAX_WD_TIMEOUT)		if (timeout < 0 \|\| timeout > IWL_MAX_WD_TIMEOUT)
	timeout = IWL_DEF_WD_TIMEOUT;		timeout = IWL_DEF_WD_TIMEOUT;

	cfg(priv)->base_params->wd_timeout = timeout;		hw_params(priv).wd_timeout = timeout;
	iwl_setup_watchdog(priv);		iwl_setup_watchdog(priv);
	return count;		return count;
	}		}