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>

diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c
index 25fdb80..2422eef 100644 (file)
--- 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)
        if (iwl_is_rfkill(priv->shrd))
                return;
 
-       timeout = cfg(priv)->base_params->wd_timeout;
+       timeout = hw_params(priv).wd_timeout;
        if (timeout == 0)
                return;
 
@@ -1355,7 +1355,7 @@ void iwl_bg_watchdog(unsigned long data)
 
 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) {
                /* use system default */

diff --git a/drivers/net/wireless/iwlwifi/iwl-debugfs.c b/drivers/net/wireless/iwlwifi/iwl-debugfs.c
index ade4134..116c785 100644 (file)
--- 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,
        if (timeout < 0 || timeout > IWL_MAX_WD_TIMEOUT)
                timeout = IWL_DEF_WD_TIMEOUT;
 
-       cfg(priv)->base_params->wd_timeout = timeout;
+       hw_params(priv).wd_timeout = timeout;
        iwl_setup_watchdog(priv);
        return count;
 }