diff options
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-core.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-debugfs.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c index 25fdb805abc3..2422eef6d15f 100644 --- a/drivers/net/wireless/iwlwifi/iwl-core.c +++ b/drivers/net/wireless/iwlwifi/iwl-core.c | |||
@@ -1340,7 +1340,7 @@ void iwl_bg_watchdog(unsigned long data) | |||
1340 | if (iwl_is_rfkill(priv->shrd)) | 1340 | if (iwl_is_rfkill(priv->shrd)) |
1341 | return; | 1341 | return; |
1342 | 1342 | ||
1343 | timeout = cfg(priv)->base_params->wd_timeout; | 1343 | timeout = hw_params(priv).wd_timeout; |
1344 | if (timeout == 0) | 1344 | if (timeout == 0) |
1345 | return; | 1345 | return; |
1346 | 1346 | ||
@@ -1355,7 +1355,7 @@ void iwl_bg_watchdog(unsigned long data) | |||
1355 | 1355 | ||
1356 | void iwl_setup_watchdog(struct iwl_priv *priv) | 1356 | void iwl_setup_watchdog(struct iwl_priv *priv) |
1357 | { | 1357 | { |
1358 | unsigned int timeout = cfg(priv)->base_params->wd_timeout; | 1358 | unsigned int timeout = hw_params(priv).wd_timeout; |
1359 | 1359 | ||
1360 | if (!iwlagn_mod_params.wd_disable) { | 1360 | if (!iwlagn_mod_params.wd_disable) { |
1361 | /* use system default */ | 1361 | /* use system default */ |
diff --git a/drivers/net/wireless/iwlwifi/iwl-debugfs.c b/drivers/net/wireless/iwlwifi/iwl-debugfs.c index ade4134fc1ec..116c7851f3b1 100644 --- a/drivers/net/wireless/iwlwifi/iwl-debugfs.c +++ b/drivers/net/wireless/iwlwifi/iwl-debugfs.c | |||
@@ -2368,7 +2368,7 @@ static ssize_t iwl_dbgfs_wd_timeout_write(struct file *file, | |||
2368 | if (timeout < 0 || timeout > IWL_MAX_WD_TIMEOUT) | 2368 | if (timeout < 0 || timeout > IWL_MAX_WD_TIMEOUT) |
2369 | timeout = IWL_DEF_WD_TIMEOUT; | 2369 | timeout = IWL_DEF_WD_TIMEOUT; |
2370 | 2370 | ||
2371 | cfg(priv)->base_params->wd_timeout = timeout; | 2371 | hw_params(priv).wd_timeout = timeout; |
2372 | iwl_setup_watchdog(priv); | 2372 | iwl_setup_watchdog(priv); |
2373 | return count; | 2373 | return count; |
2374 | } | 2374 | } |