Commit 15b86bff authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

iwlwifi: move wowlan bool into priv 



With the new WoWLAN flow into the transport
there no longer is a need for this to be
shared, so move it into priv.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 2dd4f9f7

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

+1 −1
Original line number Diff line number Diff line
@@ -1193,7 +1193,7 @@ int iwlagn_suspend(struct iwl_priv *priv, 


	iwl_trans_stop_device(trans(priv));



	priv->shrd->wowlan = true;

	priv->wowlan = true;



	ret = iwl_load_ucode_wait_alive(trans(priv), IWL_UCODE_WOWLAN);

	if (ret)

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

+1 −1
Original line number Diff line number Diff line
@@ -586,7 +586,7 @@ void iwl_restore_stations(struct iwl_priv *priv, struct iwl_rxon_context *ctx) 
			       sizeof(struct iwl_addsta_cmd));

			send_lq = false;

			if (priv->stations[i].lq) {

				if (priv->shrd->wowlan)

				if (priv->wowlan)

					iwl_sta_fill_lq(priv, ctx, i, &lq);

				else

					memcpy(&lq, priv->stations[i].lq,

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

+1 −1
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ static void iwlagn_tx_cmd_build_rate(struct iwl_priv *priv, 
	u8 data_retry_limit;

	u8 rate_plcp;



	if (priv->shrd->wowlan) {

	if (priv->wowlan) {

		rts_retry_limit = IWLAGN_LOW_RETRY_LIMIT;

		data_retry_limit = IWLAGN_LOW_RETRY_LIMIT;

	} else {

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

+2 −2
Original line number Diff line number Diff line
@@ -701,7 +701,7 @@ int iwl_alive_start(struct iwl_priv *priv) 
	/* Configure Tx antenna selection based on H/W config */

	iwlagn_send_tx_ant_config(priv, hw_params(priv).valid_tx_ant);



	if (iwl_is_associated_ctx(ctx) && !priv->shrd->wowlan) {

	if (iwl_is_associated_ctx(ctx) && !priv->wowlan) {

		struct iwl_rxon_cmd *active_rxon =

				(struct iwl_rxon_cmd *)&ctx->active;

		/* apply any changes in staging */
@@ -716,7 +716,7 @@ int iwl_alive_start(struct iwl_priv *priv) 
		iwlagn_set_rxon_chain(priv, ctx);

	}



	if (!priv->shrd->wowlan) {

	if (!priv->wowlan) {

		/* WoWLAN ucode will not reply in the same way, skip it */

		iwl_reset_run_time_calib(priv);

	}

drivers/net/wireless/iwlwifi/iwl-dev.h

+2 −0
Original line number Diff line number Diff line
@@ -787,6 +787,8 @@ struct iwl_priv { 


	bool new_scan_threshold_behaviour;



	bool wowlan;



	/* EEPROM MAC addresses */

	struct mac_address addresses[2];