diff options
author | Johannes Berg <johannes.berg@intel.com> | 2012-03-06 16:30:54 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-03-07 13:55:44 -0500 |
commit | e7a09438b3369732b9c5cfbca24d3bc894fc1ec1 (patch) | |
tree | 3fbb63078d7d0e1ae5d7683bf985a797602fb381 /drivers/net/wireless/iwlwifi/iwl-core.c | |
parent | ab5c0f1f2d525ed17f1abf727d213cf220ed26a8 (diff) |
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>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-core.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c index 25fdb805abc..2422eef6d15 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 */ |