diff options
-rw-r--r-- | drivers/net/wireless/iwlwifi/dvm/main.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-config.h | 2 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/pcie/1000.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/pcie/5000.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/dvm/main.c b/drivers/net/wireless/iwlwifi/dvm/main.c index ebdc8b93bc04..c91b66c77972 100644 --- a/drivers/net/wireless/iwlwifi/dvm/main.c +++ b/drivers/net/wireless/iwlwifi/dvm/main.c | |||
@@ -1347,7 +1347,7 @@ static struct iwl_op_mode *iwl_op_mode_dvm_start(struct iwl_trans *trans, | |||
1347 | trans_cfg.queue_watchdog_timeout = | 1347 | trans_cfg.queue_watchdog_timeout = |
1348 | priv->cfg->base_params->wd_timeout; | 1348 | priv->cfg->base_params->wd_timeout; |
1349 | else | 1349 | else |
1350 | trans_cfg.queue_watchdog_timeout = IWL_WATCHHDOG_DISABLED; | 1350 | trans_cfg.queue_watchdog_timeout = IWL_WATCHDOG_DISABLED; |
1351 | trans_cfg.command_names = iwl_dvm_cmd_strings; | 1351 | trans_cfg.command_names = iwl_dvm_cmd_strings; |
1352 | 1352 | ||
1353 | ucode_flags = fw->ucode_capa.flags; | 1353 | ucode_flags = fw->ucode_capa.flags; |
diff --git a/drivers/net/wireless/iwlwifi/iwl-config.h b/drivers/net/wireless/iwlwifi/iwl-config.h index e9accfccc050..10e47938b635 100644 --- a/drivers/net/wireless/iwlwifi/iwl-config.h +++ b/drivers/net/wireless/iwlwifi/iwl-config.h | |||
@@ -113,7 +113,7 @@ enum iwl_led_mode { | |||
113 | #define IWL_MAX_PLCP_ERR_THRESHOLD_DISABLE 0 | 113 | #define IWL_MAX_PLCP_ERR_THRESHOLD_DISABLE 0 |
114 | 114 | ||
115 | /* TX queue watchdog timeouts in mSecs */ | 115 | /* TX queue watchdog timeouts in mSecs */ |
116 | #define IWL_WATCHHDOG_DISABLED 0 | 116 | #define IWL_WATCHDOG_DISABLED 0 |
117 | #define IWL_DEF_WD_TIMEOUT 2000 | 117 | #define IWL_DEF_WD_TIMEOUT 2000 |
118 | #define IWL_LONG_WD_TIMEOUT 10000 | 118 | #define IWL_LONG_WD_TIMEOUT 10000 |
119 | #define IWL_MAX_WD_TIMEOUT 120000 | 119 | #define IWL_MAX_WD_TIMEOUT 120000 |
diff --git a/drivers/net/wireless/iwlwifi/pcie/1000.c b/drivers/net/wireless/iwlwifi/pcie/1000.c index 0269ea6a5c35..81b83f484f08 100644 --- a/drivers/net/wireless/iwlwifi/pcie/1000.c +++ b/drivers/net/wireless/iwlwifi/pcie/1000.c | |||
@@ -64,7 +64,7 @@ static const struct iwl_base_params iwl1000_base_params = { | |||
64 | .support_ct_kill_exit = true, | 64 | .support_ct_kill_exit = true, |
65 | .plcp_delta_threshold = IWL_MAX_PLCP_ERR_EXT_LONG_THRESHOLD_DEF, | 65 | .plcp_delta_threshold = IWL_MAX_PLCP_ERR_EXT_LONG_THRESHOLD_DEF, |
66 | .chain_noise_scale = 1000, | 66 | .chain_noise_scale = 1000, |
67 | .wd_timeout = IWL_WATCHHDOG_DISABLED, | 67 | .wd_timeout = IWL_WATCHDOG_DISABLED, |
68 | .max_event_log_size = 128, | 68 | .max_event_log_size = 128, |
69 | }; | 69 | }; |
70 | 70 | ||
diff --git a/drivers/net/wireless/iwlwifi/pcie/5000.c b/drivers/net/wireless/iwlwifi/pcie/5000.c index 745a358ab8e8..d1665fa6d15a 100644 --- a/drivers/net/wireless/iwlwifi/pcie/5000.c +++ b/drivers/net/wireless/iwlwifi/pcie/5000.c | |||
@@ -62,7 +62,7 @@ static const struct iwl_base_params iwl5000_base_params = { | |||
62 | .led_compensation = 51, | 62 | .led_compensation = 51, |
63 | .plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF, | 63 | .plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF, |
64 | .chain_noise_scale = 1000, | 64 | .chain_noise_scale = 1000, |
65 | .wd_timeout = IWL_WATCHHDOG_DISABLED, | 65 | .wd_timeout = IWL_WATCHDOG_DISABLED, |
66 | .max_event_log_size = 512, | 66 | .max_event_log_size = 512, |
67 | .no_idle_support = true, | 67 | .no_idle_support = true, |
68 | }; | 68 | }; |