iwlwifi: Execute runtime calibration always

Runtime DC calibration was previously conditional. Remove this
behaviour, as new devices support runtime DC calibration,
while older devices ignore the runtime DC calibration request.

This patch addresses low TX throughput issues seen with the 6205.

Signed-off-by: Meenakshi Venkataraman <meenakshi.venkataraman@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>

2 files changed, 4 insertions, 5 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index 9daa4d970d02..b5c7c5f0a753 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -1253,9 +1253,10 @@ int iwl_alive_start(struct iwl_priv *priv)
                 iwl_send_bt_config(priv);
         }
 
-        if (hw_params(priv).calib_rt_cfg)
-                iwlagn_send_calib_cfg_rt(priv,
-                                         hw_params(priv).calib_rt_cfg);
+        /*
+         * Perform runtime calibrations, including DC calibration.
+         */
+        iwlagn_send_calib_cfg_rt(priv, IWL_CALIB_CFG_DC_IDX);
 
         ieee80211_wake_queues(priv->hw);
 
diff --git a/drivers/net/wireless/iwlwifi/iwl-shared.h b/drivers/net/wireless/iwlwifi/iwl-shared.h
index 66c62580b63c..dc55cc4a8108 100644
--- a/drivers/net/wireless/iwlwifi/iwl-shared.h
+++ b/drivers/net/wireless/iwlwifi/iwl-shared.h
@@ -179,7 +179,6 @@ struct iwl_mod_params {
  * @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
- * @calib_rt_cfg: setup runtime calibrations for the hw
  * @struct iwl_sensitivity_ranges: range of sensitivity values
  */
 struct iwl_hw_params {
@@ -199,7 +198,6 @@ struct iwl_hw_params {
         u32 ct_kill_exit_threshold;
         unsigned int wd_timeout;
 
-        u32 calib_rt_cfg;
         const struct iwl_sensitivity_ranges *sens;
 };