From e95880b50997390744a68e0863394073ab81f5d4 Mon Sep 17 00:00:00 2001
From: "Venkataraman, Meenakshi" <meenakshi.venkataraman@intel.com>
Date: Wed, 14 Dec 2011 16:54:21 -0800
Subject: [PATCH] --- yaml --- r: 279352 b: refs/heads/master c:
 885765f148b69b0269a50d0d89d2f20fe018fb8d h: refs/heads/master v: v3

---
 [refs]                                          | 2 +-
 trunk/drivers/net/wireless/iwlwifi/iwl-agn.c    | 7 ++++---
 trunk/drivers/net/wireless/iwlwifi/iwl-shared.h | 2 --
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 028a394f55a2..dc7ecb7df7e4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fb6c1c6c352260bc1c90e474f6c08de7e06f1990
+refs/heads/master: 885765f148b69b0269a50d0d89d2f20fe018fb8d
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-agn.c b/trunk/drivers/net/wireless/iwlwifi/iwl-agn.c
index 9daa4d970d02..b5c7c5f0a753 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/trunk/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/trunk/drivers/net/wireless/iwlwifi/iwl-shared.h b/trunk/drivers/net/wireless/iwlwifi/iwl-shared.h
index 66c62580b63c..dc55cc4a8108 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl-shared.h
+++ b/trunk/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;
 };