iwlwifi: add disable rf calibration support for 6000g2a and 6000g2b

Radio calibration (chain noise and sensitivity) should be allowed to
be disabled from debugfs if compiled with CONFIG_IWLWIFI_DEBUGFS. For both
6000g2a and 6000g2b, the parameters are missing in "cfg", which cause
user can not disable the radio calibration manually; add the support to
allow the operation.

Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>

diff --git a/drivers/net/wireless/iwlwifi/iwl-6000.c b/drivers/net/wireless/iwlwifi/iwl-6000.c
index 61cf0b3e88c2f460bb350ee2a3ae5ae4507bfab9..8577664da77c410e11cd5afc01570c6cfc156c13 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-6000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-6000.c
@@ -423,6 +423,8 @@ struct iwl_cfg iwl6000g2a_2abg_cfg = {
        .chain_noise_scale = 1000,
        .monitor_recover_period = IWL_MONITORING_PERIOD,
        .max_event_log_size = 512,
+       .sensitivity_calib_by_driver = true,
+       .chain_noise_calib_by_driver = true,
        .need_dc_calib = true,
 };
 
@@ -456,6 +458,8 @@ struct iwl_cfg iwl6000g2a_2bg_cfg = {
        .chain_noise_scale = 1000,
        .monitor_recover_period = IWL_MONITORING_PERIOD,
        .max_event_log_size = 512,
+       .sensitivity_calib_by_driver = true,
+       .chain_noise_calib_by_driver = true,
        .need_dc_calib = true,
 };
 
@@ -491,6 +495,8 @@ struct iwl_cfg iwl6000g2b_2agn_cfg = {
        .chain_noise_scale = 1000,
        .monitor_recover_period = IWL_MONITORING_PERIOD,
        .max_event_log_size = 512,
+       .sensitivity_calib_by_driver = true,
+       .chain_noise_calib_by_driver = true,
        .need_dc_calib = true,
 };
 
@@ -524,6 +530,8 @@ struct iwl_cfg iwl6000g2b_2abg_cfg = {
        .chain_noise_scale = 1000,
        .monitor_recover_period = IWL_MONITORING_PERIOD,
        .max_event_log_size = 512,
+       .sensitivity_calib_by_driver = true,
+       .chain_noise_calib_by_driver = true,
        .need_dc_calib = true,
 };
 
@@ -559,6 +567,8 @@ struct iwl_cfg iwl6000g2b_2bgn_cfg = {
        .chain_noise_scale = 1000,
        .monitor_recover_period = IWL_MONITORING_PERIOD,
        .max_event_log_size = 512,
+       .sensitivity_calib_by_driver = true,
+       .chain_noise_calib_by_driver = true,
        .need_dc_calib = true,
 };
 
@@ -592,6 +602,8 @@ struct iwl_cfg iwl6000g2b_2bg_cfg = {
        .chain_noise_scale = 1000,
        .monitor_recover_period = IWL_MONITORING_PERIOD,
        .max_event_log_size = 512,
+       .sensitivity_calib_by_driver = true,
+       .chain_noise_calib_by_driver = true,
        .need_dc_calib = true,
 };
 
@@ -627,6 +639,8 @@ struct iwl_cfg iwl6000g2b_bgn_cfg = {
        .chain_noise_scale = 1000,
        .monitor_recover_period = IWL_MONITORING_PERIOD,
        .max_event_log_size = 512,
+       .sensitivity_calib_by_driver = true,
+       .chain_noise_calib_by_driver = true,
        .need_dc_calib = true,
 };
 
@@ -660,6 +674,8 @@ struct iwl_cfg iwl6000g2b_bg_cfg = {
        .chain_noise_scale = 1000,
        .monitor_recover_period = IWL_MONITORING_PERIOD,
        .max_event_log_size = 512,
+       .sensitivity_calib_by_driver = true,
+       .chain_noise_calib_by_driver = true,
        .need_dc_calib = true,
 };