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

Commit 87c8c72d authored by Dan Williams's avatar Dan Williams Committed by John W. Linville
Browse files

libertas: convert CMD_802_11_RF_TX_POWER to a direct command 



And while we're at it, grab min/max TX power from the firmware and use
that to validate incoming TX power requests from WEXT.

Signed-off-by: default avatarDan Williams <dcbw@redhat.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 095f695c

drivers/net/wireless/libertas/cmd.c

+50 −35
Original line number Diff line number Diff line
@@ -614,47 +614,67 @@ static int lbs_cmd_802_11_snmp_mib(struct lbs_private *priv, 
	return 0;

}



static int lbs_cmd_802_11_rf_tx_power(struct cmd_ds_command *cmd,

				       u16 cmd_action, void *pdata_buf)

/**

 *  @brief Get the min, max, and current TX power

 *

 *  @param priv    	A pointer to struct lbs_private structure

 *  @param curlevel  	Current power level in dBm

 *  @param minlevel  	Minimum supported power level in dBm (optional)

 *  @param maxlevel  	Maximum supported power level in dBm (optional)

 *

 *  @return 	   	0 on success, error on failure

 */

int lbs_get_tx_power(struct lbs_private *priv, s16 *curlevel, s16 *minlevel,

		     s16 *maxlevel)

{



	struct cmd_ds_802_11_rf_tx_power *prtp = &cmd->params.txp;

	struct cmd_ds_802_11_rf_tx_power cmd;

	int ret;



	lbs_deb_enter(LBS_DEB_CMD);



	cmd->size =

	    cpu_to_le16((sizeof(struct cmd_ds_802_11_rf_tx_power)) + S_DS_GEN);

	cmd->command = cpu_to_le16(CMD_802_11_RF_TX_POWER);

	prtp->action = cpu_to_le16(cmd_action);

	memset(&cmd, 0, sizeof(cmd));

	cmd.hdr.size = cpu_to_le16(sizeof(cmd));

	cmd.action = cpu_to_le16(CMD_ACT_GET);



	lbs_deb_cmd("RF_TX_POWER_CMD: size:%d cmd:0x%x Act:%d\n",

		    le16_to_cpu(cmd->size), le16_to_cpu(cmd->command),

		    le16_to_cpu(prtp->action));

	ret = lbs_cmd_with_response(priv, CMD_802_11_RF_TX_POWER, &cmd);

	if (ret == 0) {

		*curlevel = le16_to_cpu(cmd.curlevel);

		if (minlevel)

			*minlevel = le16_to_cpu(cmd.minlevel);

		if (maxlevel)

			*maxlevel = le16_to_cpu(cmd.maxlevel);

	}



	switch (cmd_action) {

	case CMD_ACT_TX_POWER_OPT_GET:

		prtp->action = cpu_to_le16(CMD_ACT_GET);

		prtp->currentlevel = 0;

		break;

	lbs_deb_leave(LBS_DEB_CMD);

	return ret;

}



	case CMD_ACT_TX_POWER_OPT_SET_HIGH:

		prtp->action = cpu_to_le16(CMD_ACT_SET);

		prtp->currentlevel = cpu_to_le16(CMD_ACT_TX_POWER_INDEX_HIGH);

		break;

/**

 *  @brief Set the TX power

 *

 *  @param priv    	A pointer to struct lbs_private structure

 *  @param dbm  	The desired power level in dBm

 *

 *  @return 	   	0 on success, error on failure

 */

int lbs_set_tx_power(struct lbs_private *priv, s16 dbm)

{

	struct cmd_ds_802_11_rf_tx_power cmd;

	int ret;



	case CMD_ACT_TX_POWER_OPT_SET_MID:

		prtp->action = cpu_to_le16(CMD_ACT_SET);

		prtp->currentlevel = cpu_to_le16(CMD_ACT_TX_POWER_INDEX_MID);

		break;

	lbs_deb_enter(LBS_DEB_CMD);



	case CMD_ACT_TX_POWER_OPT_SET_LOW:

		prtp->action = cpu_to_le16(CMD_ACT_SET);

		prtp->currentlevel = cpu_to_le16(*((u16 *) pdata_buf));

		break;

	}

	memset(&cmd, 0, sizeof(cmd));

	cmd.hdr.size = cpu_to_le16(sizeof(cmd));

	cmd.action = cpu_to_le16(CMD_ACT_SET);

	cmd.curlevel = cpu_to_le16(dbm);



	lbs_deb_cmd("SET_RF_TX_POWER: %d dBm\n", dbm);



	ret = lbs_cmd_with_response(priv, CMD_802_11_RF_TX_POWER, &cmd);



	lbs_deb_leave(LBS_DEB_CMD);

	return 0;

	return ret;

}



static int lbs_cmd_802_11_monitor_mode(struct cmd_ds_command *cmd,
@@ -1420,11 +1440,6 @@ int lbs_prepare_and_send_command(struct lbs_private *priv, 
		ret = lbs_cmd_reg_access(cmdptr, cmd_action, pdata_buf);

		break;



	case CMD_802_11_RF_TX_POWER:

		ret = lbs_cmd_802_11_rf_tx_power(cmdptr,

						 cmd_action, pdata_buf);

		break;



	case CMD_802_11_MONITOR_MODE:

		ret = lbs_cmd_802_11_monitor_mode(cmdptr,

				          cmd_action, pdata_buf);

drivers/net/wireless/libertas/cmd.h

+4 −0
Original line number Diff line number Diff line
@@ -61,4 +61,8 @@ int lbs_cmd_802_11_enable_rsn(struct lbs_private *priv, uint16_t cmd_action, 
int lbs_cmd_802_11_key_material(struct lbs_private *priv, uint16_t cmd_action,

				struct assoc_request *assoc);



int lbs_get_tx_power(struct lbs_private *priv, s16 *curlevel, s16 *minlevel,

		     s16 *maxlevel);

int lbs_set_tx_power(struct lbs_private *priv, s16 dbm);



#endif /* _LBS_CMD_H */

drivers/net/wireless/libertas/cmdresp.c

+0 −19
Original line number Diff line number Diff line
@@ -188,21 +188,6 @@ static int lbs_ret_802_11_snmp_mib(struct lbs_private *priv, 
	return 0;

}



static int lbs_ret_802_11_rf_tx_power(struct lbs_private *priv,

				       struct cmd_ds_command *resp)

{

	struct cmd_ds_802_11_rf_tx_power *rtp = &resp->params.txp;



	lbs_deb_enter(LBS_DEB_CMD);



	priv->txpowerlevel = le16_to_cpu(rtp->currentlevel);



	lbs_deb_cmd("TX power currently %d\n", priv->txpowerlevel);



	lbs_deb_leave(LBS_DEB_CMD);

	return 0;

}



static int lbs_ret_802_11_rssi(struct lbs_private *priv,

				struct cmd_ds_command *resp)

{
@@ -287,10 +272,6 @@ static inline int handle_cmd_response(struct lbs_private *priv, 
		ret = lbs_ret_802_11_snmp_mib(priv, resp);

		break;



	case CMD_RET(CMD_802_11_RF_TX_POWER):

		ret = lbs_ret_802_11_rf_tx_power(priv, resp);

		break;



	case CMD_RET(CMD_802_11_SET_AFC):

	case CMD_RET(CMD_802_11_GET_AFC):

		spin_lock_irqsave(&priv->driver_lock, flags);

drivers/net/wireless/libertas/dev.h

+3 −1
Original line number Diff line number Diff line
@@ -253,7 +253,9 @@ struct lbs_private { 
	u32 connect_status;

	u32 mesh_connect_status;

	u16 regioncode;

	u16 txpowerlevel;

	s16 txpower_cur;

	s16 txpower_min;

	s16 txpower_max;



	/** POWER MANAGEMENT AND PnP SUPPORT */

	u8 surpriseremoved;

drivers/net/wireless/libertas/host.h

+0 −10
Original line number Diff line number Diff line
@@ -178,16 +178,6 @@ 
#define CMD_OPT_802_11_RF_CHANNEL_GET	0x00

#define CMD_OPT_802_11_RF_CHANNEL_SET	0x01



/* Define action or option for CMD_802_11_RF_TX_POWER */

#define CMD_ACT_TX_POWER_OPT_GET	0x0000

#define CMD_ACT_TX_POWER_OPT_SET_HIGH	0x8007

#define CMD_ACT_TX_POWER_OPT_SET_MID	0x8004

#define CMD_ACT_TX_POWER_OPT_SET_LOW	0x8000



#define CMD_ACT_TX_POWER_INDEX_HIGH	0x0007

#define CMD_ACT_TX_POWER_INDEX_MID	0x0004

#define CMD_ACT_TX_POWER_INDEX_LOW	0x0000



/* Define action or option for CMD_802_11_DATA_RATE */

#define CMD_ACT_SET_TX_AUTO		0x0000

#define CMD_ACT_SET_TX_FIX_RATE		0x0001