diff options
author | Olof Johansson <olof@lixom.net> | 2011-12-13 19:35:03 -0800 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2011-12-13 19:35:03 -0800 |
commit | 2da994e687f7991cc76e3270c423bf6500b9424a (patch) | |
tree | 437d685035c2a39395f14c233831422ed636c016 /drivers/net/wireless/iwlwifi/iwl-core.c | |
parent | 00e929808a1cb410f45a620c0fc79d8d0a2506b1 (diff) | |
parent | db33f4de9952af112b0d4f2436ce931ae632aba0 (diff) |
Merge branch 'orion/devel' into next/devel
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-core.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-core.c | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c index 001fdf140abb..fcf54160e4ed 100644 --- a/drivers/net/wireless/iwlwifi/iwl-core.c +++ b/drivers/net/wireless/iwlwifi/iwl-core.c @@ -1810,11 +1810,23 @@ void iwl_setup_watchdog(struct iwl_priv *priv) { unsigned int timeout = priv->cfg->base_params->wd_timeout; - if (timeout && !iwlagn_mod_params.wd_disable) - mod_timer(&priv->watchdog, - jiffies + msecs_to_jiffies(IWL_WD_TICK(timeout))); - else - del_timer(&priv->watchdog); + if (!iwlagn_mod_params.wd_disable) { + /* use system default */ + if (timeout && !priv->cfg->base_params->wd_disable) + mod_timer(&priv->watchdog, + jiffies + + msecs_to_jiffies(IWL_WD_TICK(timeout))); + else + del_timer(&priv->watchdog); + } else { + /* module parameter overwrite default configuration */ + if (timeout && iwlagn_mod_params.wd_disable == 2) + mod_timer(&priv->watchdog, + jiffies + + msecs_to_jiffies(IWL_WD_TICK(timeout))); + else + del_timer(&priv->watchdog); + } } /** |