Commit 36da7d70 authored by Zhu Yi's avatar Zhu Yi Committed by John W. Linville
Browse files

iwlwifi: send TXPOWER command after a new RXON command 



The patch fixes the problem that TXPOWER command is not sent
after we issue a new RXON command which requires a tune. Otherwise
we won't be able to Tx any frames.

Signed-off-by: default avatarZhu Yi <yi.zhu@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent fe905f1d

drivers/net/wireless/iwlwifi/iwl4965-base.c

+10 −10
Original line number Diff line number Diff line
@@ -328,16 +328,6 @@ static int iwl4965_commit_rxon(struct iwl_priv *priv) 
	if (!priv->error_recovering)

		priv->start_calib = 0;



	iwl_init_sensitivity(priv);



	/* If we issue a new RXON command which required a tune then we must

	 * send a new TXPOWER command or we won't be able to Tx any frames */

	ret = iwl_set_tx_power(priv, priv->tx_power_user_lmt, true);

	if (ret) {

		IWL_ERROR("Error sending TX power (%d)\n", ret);

		return ret;

	}



	/* Add the broadcast address so we can send broadcast frames */

	if (iwl_rxon_add_station(priv, iwl_bcast_addr, 0) ==

						IWL_INVALID_STATION) {
@@ -373,6 +363,16 @@ static int iwl4965_commit_rxon(struct iwl_priv *priv) 
		memcpy(active_rxon, &priv->staging_rxon, sizeof(*active_rxon));

	}



	iwl_init_sensitivity(priv);



	/* If we issue a new RXON command which required a tune then we must

	 * send a new TXPOWER command or we won't be able to Tx any frames */

	ret = iwl_set_tx_power(priv, priv->tx_power_user_lmt, true);

	if (ret) {

		IWL_ERROR("Error sending TX power (%d)\n", ret);

		return ret;

	}



	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE