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

Commit e6a62a6e authored by Meenakshi Venkataraman's avatar Meenakshi Venkataraman Committed by Wey-Yi Guy
Browse files

iwlwifi: move iwl_set_tx_power and make it static 



This function is used only in iwl-agn-rxon.c,
move it there and mark it static.

Move this function as part of iwl-core.c
cleanup.

Signed-off-by: default avatarMeenakshi Venkataraman <meenakshi.venkataraman@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
parent 193219cf

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

+55 −0
Original line number Original line Diff line number Diff line
@@ -407,6 +407,61 @@ static int iwlagn_rxon_disconn(struct iwl_priv *priv, 
	return 0;

	return 0;

}

}





static int iwl_set_tx_power(struct iwl_priv *priv, s8 tx_power, bool force)

{

	int ret;

	s8 prev_tx_power;

	bool defer;

	struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS];



	lockdep_assert_held(&priv->mutex);



	if (priv->tx_power_user_lmt == tx_power && !force)

		return 0;



	if (tx_power < IWLAGN_TX_POWER_TARGET_POWER_MIN) {

		IWL_WARN(priv,

			 "Requested user TXPOWER %d below lower limit %d.\n",

			 tx_power,

			 IWLAGN_TX_POWER_TARGET_POWER_MIN);

		return -EINVAL;

	}



	if (tx_power > priv->tx_power_device_lmt) {

		IWL_WARN(priv,

			"Requested user TXPOWER %d above upper limit %d.\n",

			 tx_power, priv->tx_power_device_lmt);

		return -EINVAL;

	}



	if (!iwl_is_ready_rf(priv))

		return -EIO;



	/* scan complete and commit_rxon use tx_power_next value,

	 * it always need to be updated for newest request */

	priv->tx_power_next = tx_power;



	/* do not set tx power when scanning or channel changing */

	defer = test_bit(STATUS_SCANNING, &priv->status) ||

		memcmp(&ctx->active, &ctx->staging, sizeof(ctx->staging));

	if (defer && !force) {

		IWL_DEBUG_INFO(priv, "Deferring tx power set\n");

		return 0;

	}



	prev_tx_power = priv->tx_power_user_lmt;

	priv->tx_power_user_lmt = tx_power;



	ret = iwlagn_send_tx_power(priv);



	/* if fail to set tx_power, restore the orig. tx power */

	if (ret) {

		priv->tx_power_user_lmt = prev_tx_power;

		priv->tx_power_next = prev_tx_power;

	}

	return ret;

}



static int iwlagn_rxon_connect(struct iwl_priv *priv,

static int iwlagn_rxon_connect(struct iwl_priv *priv,

			       struct iwl_rxon_context *ctx)

			       struct iwl_rxon_context *ctx)

{

{

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

+0 −55
Original line number Original line Diff line number Diff line
@@ -66,61 +66,6 @@ void iwl_print_rx_config_cmd(struct iwl_priv *priv, 
}

}

#endif

#endif





int iwl_set_tx_power(struct iwl_priv *priv, s8 tx_power, bool force)

{

	int ret;

	s8 prev_tx_power;

	bool defer;

	struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS];



	lockdep_assert_held(&priv->mutex);



	if (priv->tx_power_user_lmt == tx_power && !force)

		return 0;



	if (tx_power < IWLAGN_TX_POWER_TARGET_POWER_MIN) {

		IWL_WARN(priv,

			 "Requested user TXPOWER %d below lower limit %d.\n",

			 tx_power,

			 IWLAGN_TX_POWER_TARGET_POWER_MIN);

		return -EINVAL;

	}



	if (tx_power > priv->tx_power_device_lmt) {

		IWL_WARN(priv,

			"Requested user TXPOWER %d above upper limit %d.\n",

			 tx_power, priv->tx_power_device_lmt);

		return -EINVAL;

	}



	if (!iwl_is_ready_rf(priv))

		return -EIO;



	/* scan complete and commit_rxon use tx_power_next value,

	 * it always need to be updated for newest request */

	priv->tx_power_next = tx_power;



	/* do not set tx power when scanning or channel changing */

	defer = test_bit(STATUS_SCANNING, &priv->status) ||

		memcmp(&ctx->active, &ctx->staging, sizeof(ctx->staging));

	if (defer && !force) {

		IWL_DEBUG_INFO(priv, "Deferring tx power set\n");

		return 0;

	}



	prev_tx_power = priv->tx_power_user_lmt;

	priv->tx_power_user_lmt = tx_power;



	ret = iwlagn_send_tx_power(priv);



	/* if fail to set tx_power, restore the orig. tx power */

	if (ret) {

		priv->tx_power_user_lmt = prev_tx_power;

		priv->tx_power_next = prev_tx_power;

	}

	return ret;

}



void iwl_send_bt_config(struct iwl_priv *priv)

void iwl_send_bt_config(struct iwl_priv *priv)

{

{

	struct iwl_bt_cmd bt_cmd = {

	struct iwl_bt_cmd bt_cmd = {

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

+0 −5
Original line number Original line Diff line number Diff line
@@ -118,11 +118,6 @@ static inline void iwl_update_stats(struct iwl_priv *priv, bool is_tx, 
}

}

#endif

#endif





/*****************************************************

 * TX power

 ****************************************************/

int iwl_set_tx_power(struct iwl_priv *priv, s8 tx_power, bool force);



/*******************************************************************************

/*******************************************************************************

 * Scanning

 * Scanning

 ******************************************************************************/

 ******************************************************************************/