Index: chromeos/compat-wireless/drivers/net/wireless/iwlwifi/iwl-6000.c |
diff --git a/chromeos/compat-wireless/drivers/net/wireless/iwlwifi/iwl-6000.c b/chromeos/compat-wireless/drivers/net/wireless/iwlwifi/iwl-6000.c |
index af4fd50f3405db334ce2e44e1ce648c7c510ed7c..cee06b968de807a642adb4db4e08e62cfe2237ab 100644 |
--- a/chromeos/compat-wireless/drivers/net/wireless/iwlwifi/iwl-6000.c |
+++ b/chromeos/compat-wireless/drivers/net/wireless/iwlwifi/iwl-6000.c |
@@ -388,7 +388,7 @@ struct iwl_cfg iwl6000g2a_2agn_cfg = { |
.support_ct_kill_exit = true, |
.plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF, |
.chain_noise_scale = 1000, |
- .monitor_recover_period = IWL_MONITORING_PERIOD, |
+ .monitor_recover_period = IWL_DEF_MONITORING_PERIOD, |
.max_event_log_size = 512, |
.ucode_tracing = true, |
.sensitivity_calib_by_driver = true, |
@@ -424,7 +424,7 @@ struct iwl_cfg iwl6000g2a_2abg_cfg = { |
.support_ct_kill_exit = true, |
.plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF, |
.chain_noise_scale = 1000, |
- .monitor_recover_period = IWL_MONITORING_PERIOD, |
+ .monitor_recover_period = IWL_DEF_MONITORING_PERIOD, |
.max_event_log_size = 512, |
.sensitivity_calib_by_driver = true, |
.chain_noise_calib_by_driver = true, |
@@ -459,7 +459,7 @@ struct iwl_cfg iwl6000g2a_2bg_cfg = { |
.support_ct_kill_exit = true, |
.plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF, |
.chain_noise_scale = 1000, |
- .monitor_recover_period = IWL_MONITORING_PERIOD, |
+ .monitor_recover_period = IWL_DEF_MONITORING_PERIOD, |
.max_event_log_size = 512, |
.sensitivity_calib_by_driver = true, |
.chain_noise_calib_by_driver = true, |
@@ -496,7 +496,7 @@ struct iwl_cfg iwl6000g2b_2agn_cfg = { |
.support_ct_kill_exit = true, |
.plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF, |
.chain_noise_scale = 1000, |
- .monitor_recover_period = IWL_MONITORING_PERIOD, |
+ .monitor_recover_period = IWL_LONG_MONITORING_PERIOD, |
.max_event_log_size = 512, |
.sensitivity_calib_by_driver = true, |
.chain_noise_calib_by_driver = true, |
@@ -532,7 +532,7 @@ struct iwl_cfg iwl6000g2b_2abg_cfg = { |
.support_ct_kill_exit = true, |
.plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF, |
.chain_noise_scale = 1000, |
- .monitor_recover_period = IWL_MONITORING_PERIOD, |
+ .monitor_recover_period = IWL_LONG_MONITORING_PERIOD, |
.max_event_log_size = 512, |
.sensitivity_calib_by_driver = true, |
.chain_noise_calib_by_driver = true, |
@@ -570,7 +570,7 @@ struct iwl_cfg iwl6000g2b_2bgn_cfg = { |
.support_ct_kill_exit = true, |
.plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF, |
.chain_noise_scale = 1000, |
- .monitor_recover_period = IWL_MONITORING_PERIOD, |
+ .monitor_recover_period = IWL_LONG_MONITORING_PERIOD, |
.max_event_log_size = 512, |
.sensitivity_calib_by_driver = true, |
.chain_noise_calib_by_driver = true, |
@@ -606,7 +606,7 @@ struct iwl_cfg iwl6000g2b_2bg_cfg = { |
.support_ct_kill_exit = true, |
.plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF, |
.chain_noise_scale = 1000, |
- .monitor_recover_period = IWL_MONITORING_PERIOD, |
+ .monitor_recover_period = IWL_LONG_MONITORING_PERIOD, |
.max_event_log_size = 512, |
.sensitivity_calib_by_driver = true, |
.chain_noise_calib_by_driver = true, |
@@ -644,7 +644,7 @@ struct iwl_cfg iwl6000g2b_bgn_cfg = { |
.support_ct_kill_exit = true, |
.plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF, |
.chain_noise_scale = 1000, |
- .monitor_recover_period = IWL_MONITORING_PERIOD, |
+ .monitor_recover_period = IWL_LONG_MONITORING_PERIOD, |
.max_event_log_size = 512, |
.sensitivity_calib_by_driver = true, |
.chain_noise_calib_by_driver = true, |
@@ -680,7 +680,7 @@ struct iwl_cfg iwl6000g2b_bg_cfg = { |
.support_ct_kill_exit = true, |
.plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF, |
.chain_noise_scale = 1000, |
- .monitor_recover_period = IWL_MONITORING_PERIOD, |
+ .monitor_recover_period = IWL_LONG_MONITORING_PERIOD, |
.max_event_log_size = 512, |
.sensitivity_calib_by_driver = true, |
.chain_noise_calib_by_driver = true, |
@@ -721,7 +721,7 @@ struct iwl_cfg iwl6000i_2agn_cfg = { |
.support_ct_kill_exit = true, |
.plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF, |
.chain_noise_scale = 1000, |
- .monitor_recover_period = IWL_MONITORING_PERIOD, |
+ .monitor_recover_period = IWL_DEF_MONITORING_PERIOD, |
.max_event_log_size = 1024, |
.ucode_tracing = true, |
.sensitivity_calib_by_driver = true, |
@@ -756,7 +756,7 @@ struct iwl_cfg iwl6000i_2abg_cfg = { |
.support_ct_kill_exit = true, |
.plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF, |
.chain_noise_scale = 1000, |
- .monitor_recover_period = IWL_MONITORING_PERIOD, |
+ .monitor_recover_period = IWL_DEF_MONITORING_PERIOD, |
.max_event_log_size = 1024, |
.ucode_tracing = true, |
.sensitivity_calib_by_driver = true, |
@@ -791,7 +791,7 @@ struct iwl_cfg iwl6000i_2bg_cfg = { |
.support_ct_kill_exit = true, |
.plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF, |
.chain_noise_scale = 1000, |
- .monitor_recover_period = IWL_MONITORING_PERIOD, |
+ .monitor_recover_period = IWL_DEF_MONITORING_PERIOD, |
.max_event_log_size = 1024, |
.ucode_tracing = true, |
.sensitivity_calib_by_driver = true, |
@@ -828,7 +828,7 @@ struct iwl_cfg iwl6050_2agn_cfg = { |
.support_ct_kill_exit = true, |
.plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF, |
.chain_noise_scale = 1500, |
- .monitor_recover_period = IWL_MONITORING_PERIOD, |
+ .monitor_recover_period = IWL_DEF_MONITORING_PERIOD, |
.max_event_log_size = 1024, |
.ucode_tracing = true, |
.sensitivity_calib_by_driver = true, |
@@ -866,7 +866,7 @@ struct iwl_cfg iwl6050g2_bgn_cfg = { |
.support_ct_kill_exit = true, |
.plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF, |
.chain_noise_scale = 1500, |
- .monitor_recover_period = IWL_MONITORING_PERIOD, |
+ .monitor_recover_period = IWL_DEF_MONITORING_PERIOD, |
.max_event_log_size = 1024, |
.ucode_tracing = true, |
.sensitivity_calib_by_driver = true, |
@@ -902,7 +902,7 @@ struct iwl_cfg iwl6050_2abg_cfg = { |
.support_ct_kill_exit = true, |
.plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF, |
.chain_noise_scale = 1500, |
- .monitor_recover_period = IWL_MONITORING_PERIOD, |
+ .monitor_recover_period = IWL_DEF_MONITORING_PERIOD, |
.max_event_log_size = 1024, |
.ucode_tracing = true, |
.sensitivity_calib_by_driver = true, |
@@ -940,7 +940,7 @@ struct iwl_cfg iwl6000_3agn_cfg = { |
.support_ct_kill_exit = true, |
.plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF, |
.chain_noise_scale = 1000, |
- .monitor_recover_period = IWL_MONITORING_PERIOD, |
+ .monitor_recover_period = IWL_DEF_MONITORING_PERIOD, |
.max_event_log_size = 1024, |
.ucode_tracing = true, |
.sensitivity_calib_by_driver = true, |