diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2012-04-10 02:46:54 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-04-12 21:06:08 +0200 |
| commit | 7c5ba4a830cbb730770129b0004e2a06e47dbac5 (patch) | |
| tree | 3c86c616dbe30b31cd07d9d8720092932f84d05b /drivers/net/wireless/iwlwifi/iwl-shared.h | |
| parent | iwlwifi: remove unneeded struct declarations (diff) | |
| download | linux-7c5ba4a830cbb730770129b0004e2a06e47dbac5.tar.xz linux-7c5ba4a830cbb730770129b0004e2a06e47dbac5.zip | |
iwlwifi: move queue watchdog into transport
This removes one of the two sources of device
restarts in the upper layer -- those are a bit
inconvenient because normal restarts originate
in the transport. By moving the watchdog down
it can be treated the same.
Also rewrite the watchdog logic. Timers are
much more efficient when they never fire, so
instead firing a timer every 500ms set up a
timer for each TX queue and fire it only when
the queue is really stuck. This avoids the CPU
waking up when everything is working well.
While at it, remove the wd_disable config item
and replace it by simply setting wd_timeout to
IWL_WATCHHDOG_DISABLED (0).
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-shared.h')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-shared.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-shared.h b/drivers/net/wireless/iwlwifi/iwl-shared.h index c2e5ce995fb4..c6049cfb653d 100644 --- a/drivers/net/wireless/iwlwifi/iwl-shared.h +++ b/drivers/net/wireless/iwlwifi/iwl-shared.h @@ -169,7 +169,6 @@ struct iwl_mod_params { * @ct_kill_threshold: temperature threshold - in hw dependent unit * @ct_kill_exit_threshold: when to reeable the device - in hw dependent unit * relevant for 1000, 6000 and up - * @wd_timeout: TX queues watchdog timeout * @struct iwl_sensitivity_ranges: range of sensitivity values * @use_rts_for_aggregation: use rts/cts protection for HT traffic */ @@ -183,7 +182,6 @@ struct iwl_hw_params { u16 sku; u32 ct_kill_threshold; u32 ct_kill_exit_threshold; - unsigned int wd_timeout; const struct iwl_sensitivity_ranges *sens; }; @@ -221,7 +219,6 @@ enum iwl_led_mode { * @shadow_reg_enable: HW shadhow register bit * @hd_v2: v2 of enhanced sensitivity value, used for 2000 series and up * @no_idle_support: do not support idle mode - * wd_disable: disable watchdog timer */ struct iwl_base_params { int eeprom_size; @@ -241,7 +238,6 @@ struct iwl_base_params { const bool shadow_reg_enable; const bool hd_v2; const bool no_idle_support; - const bool wd_disable; }; /* |