iwlagn: move all post scan functions in one place

Both tx power and power save are being done after scan complete, move into
post_scan function

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

drivers/net/wireless/iwlwifi/iwl-agn-rxon.c

@@ -799,6 +799,13 @@ void iwlagn_post_scan(struct iwl_priv *priv)
 {
 	struct iwl_rxon_context *ctx;
 
+	/*
+	 * We do not commit power settings while scan is pending,
+	 * do it now if the settings changed.
+	 */
+	iwl_power_set_mode(priv, &priv->power_data.sleep_cmd_next, false);
+	iwl_set_tx_power(priv, priv->tx_power_next, false);
+
 	/*
 	 * Since setting the RXON may have been deferred while
 	 * performing the scan, fire one off if needed

drivers/net/wireless/iwlwifi/iwl-scan.c

@@ -600,13 +600,6 @@ out_settings:
 	if (!iwl_is_ready_rf(priv))
 		goto out;
 
-	/*
-	 * We do not commit power settings while scan is pending,
-	 * do it now if the settings changed.
-	 */
-	iwl_power_set_mode(priv, &priv->power_data.sleep_cmd_next, false);
-	iwl_set_tx_power(priv, priv->tx_power_next, false);
-
 	priv->cfg->ops->utils->post_scan(priv);
 
 out: