openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Johannes Berg 2012-03-06 13:30:54 -08:00 committed by John W. Linville
parent ab5c0f1f2d
commit e7a09438b3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/wireless/iwlwifi/iwl-core.c
View File

@ -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 */

2
drivers/net/wireless/iwlwifi/iwl-debugfs.c
View File

@ -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;
} }