Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c2b821d7 authored Jun 03, 2011 by Wey-Yi Guy Committed by John W. Linville Jun 03, 2011

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>

parent 15b3f3b0

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

+7 −0

Original line number	Diff line number	Diff line
		@@ -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

+0 −7

Original line number	Diff line number	Diff line
		@@ -600,13 +600,6 @@ static void iwl_bg_scan_completed(struct work_struct *work)
		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: