iwlagn: re-enable calibration

During the RXON rewrite, this code got lost.
When we've just associated, we need to enable
all calibrations and see if some were already
finished. Add back the missing code.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 14 insertions, 0 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
index d594a1658a9e..d9d617fd5078 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
@@ -569,6 +569,20 @@ void iwlagn_bss_info_changed(struct ieee80211_hw *hw,
         if (force || memcmp(&ctx->staging, &ctx->active, sizeof(ctx->staging)))
                 iwlagn_commit_rxon(priv, ctx);
 
+        if (changes & BSS_CHANGED_ASSOC && bss_conf->assoc) {
+                /*
+                 * The chain noise calibration will enable PM upon
+                 * completion. If calibration has already been run
+                 * then we need to enable power management here.
+                 */
+                if (priv->chain_noise_data.state == IWL_CHAIN_NOISE_DONE)
+                        iwl_power_update_mode(priv, false);
+
+                /* Enable RX differential gain and sensitivity calibrations */
+                iwl_chain_noise_reset(priv);
+                priv->start_calib = 1;
+        }
+
         if (changes & BSS_CHANGED_IBSS) {
                 ret = iwlagn_manage_ibss_station(priv, vif,
                                                  bss_conf->ibss_joined);