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

Commit 85319f93 authored by Javier Cardona's avatar Javier Cardona Committed by John W. Linville
Browse files

libertas: rate adaptation configuration via iwconfig. 



Implemented rate adaptation support via 'iwconfig rate' API.  It is now
possible to specify a bit-rate value and append 'auto'.  That will configure
rate adaptation to use all bit-rates equal or lower than than selected value.

Made lbs_cmd_802_11_rate_adapt_rateset a direct command.

Signed-off-by: default avatarJavier Cardona <javier@cozybit.com>
Signed-off-by: default avatarDavid Woodhouse <dwmw2@infradead.org>
Acked-by: default avatarDan Williams <dcbw@redhat.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 553381c4

drivers/net/wireless/libertas/assoc.c

+1 −1
Original line number Diff line number Diff line
@@ -1250,7 +1250,7 @@ static int get_common_rates(struct lbs_private *priv, 
	lbs_deb_hex(LBS_DEB_JOIN, "common rates", tmp, tmp_size);

	lbs_deb_join("TX data rate 0x%02x\n", priv->cur_rate);



	if (!priv->auto_rate) {

	if (!priv->enablehwauto) {

		for (i = 0; i < tmp_size; i++) {

			if (tmp[i] == priv->cur_rate)

				goto done;

drivers/net/wireless/libertas/cmd.c

+48 −19
Original line number Diff line number Diff line
@@ -676,26 +676,60 @@ static int lbs_cmd_802_11_monitor_mode(struct cmd_ds_command *cmd, 
	return 0;

}



static int lbs_cmd_802_11_rate_adapt_rateset(struct lbs_private *priv,

					      struct cmd_ds_command *cmd,

					      u16 cmd_action)

static __le16 lbs_rate_to_fw_bitmap(int rate, int lower_rates_ok)

{

	struct cmd_ds_802_11_rate_adapt_rateset

	*rateadapt = &cmd->params.rateset;

/*		Bit  	Rate

*		15:13 Reserved

*		12    54 Mbps

*		11    48 Mbps

*		10    36 Mbps

*		9     24 Mbps

*		8     18 Mbps

*		7     12 Mbps

*		6     9 Mbps

*		5     6 Mbps

*		4     Reserved

*		3     11 Mbps

*		2     5.5 Mbps

*		1     2 Mbps

*		0     1 Mbps

**/



	uint16_t ratemask;

	int i = lbs_data_rate_to_fw_index(rate);

	if (lower_rates_ok)

		ratemask = (0x1fef >> (12 - i));

	else

		ratemask = (1 << i);

	return cpu_to_le16(ratemask);

}



int lbs_cmd_802_11_rate_adapt_rateset(struct lbs_private *priv,

				      uint16_t cmd_action)

{

	struct cmd_ds_802_11_rate_adapt_rateset cmd;

	int ret;



	lbs_deb_enter(LBS_DEB_CMD);

	cmd->size =

	    cpu_to_le16(sizeof(struct cmd_ds_802_11_rate_adapt_rateset)

			     + S_DS_GEN);

	cmd->command = cpu_to_le16(CMD_802_11_RATE_ADAPT_RATESET);



	rateadapt->action = cpu_to_le16(cmd_action);

	rateadapt->enablehwauto = cpu_to_le16(priv->enablehwauto);

	rateadapt->bitmap = cpu_to_le16(priv->ratebitmap);

	if (!priv->cur_rate && !priv->enablehwauto)

		return -EINVAL;



	lbs_deb_leave(LBS_DEB_CMD);

	return 0;

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



	cmd.action = cpu_to_le16(cmd_action);

	cmd.enablehwauto = cpu_to_le16(priv->enablehwauto);

	cmd.bitmap = lbs_rate_to_fw_bitmap(priv->cur_rate, priv->enablehwauto);

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

	if (!ret && cmd_action == CMD_ACT_GET) {

		priv->ratebitmap = le16_to_cpu(cmd.bitmap);

		priv->enablehwauto = le16_to_cpu(cmd.enablehwauto);

	}



	lbs_deb_leave_args(LBS_DEB_CMD, "ret %d", ret);

	return ret;

}

EXPORT_SYMBOL_GPL(lbs_cmd_802_11_rate_adapt_rateset);



/**

 *  @brief Set the data rate
@@ -1378,11 +1412,6 @@ int lbs_prepare_and_send_command(struct lbs_private *priv, 
						 cmd_action, pdata_buf);

		break;



	case CMD_802_11_RATE_ADAPT_RATESET:

		ret = lbs_cmd_802_11_rate_adapt_rateset(priv,

							 cmdptr, cmd_action);

		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

+2 −0
Original line number Diff line number Diff line
@@ -48,6 +48,8 @@ int lbs_host_sleep_cfg(struct lbs_private *priv, uint32_t criteria); 
int lbs_suspend(struct lbs_private *priv);

void lbs_resume(struct lbs_private *priv);



int lbs_cmd_802_11_rate_adapt_rateset(struct lbs_private *priv,

				      uint16_t cmd_action);

int lbs_cmd_802_11_inactivity_timeout(struct lbs_private *priv,

				      uint16_t cmd_action, uint16_t *timeout);

int lbs_cmd_802_11_sleep_params(struct lbs_private *priv, uint16_t cmd_action,

drivers/net/wireless/libertas/cmdresp.c

+0 −20
Original line number Diff line number Diff line
@@ -203,22 +203,6 @@ static int lbs_ret_802_11_rf_tx_power(struct lbs_private *priv, 
	return 0;

}



static int lbs_ret_802_11_rate_adapt_rateset(struct lbs_private *priv,

					      struct cmd_ds_command *resp)

{

	struct cmd_ds_802_11_rate_adapt_rateset *rates = &resp->params.rateset;



	lbs_deb_enter(LBS_DEB_CMD);



	if (rates->action == CMD_ACT_GET) {

		priv->enablehwauto = le16_to_cpu(rates->enablehwauto);

		priv->ratebitmap = le16_to_cpu(rates->bitmap);

	}



	lbs_deb_leave(LBS_DEB_CMD);

	return 0;

}



static int lbs_ret_802_11_rssi(struct lbs_private *priv,

				struct cmd_ds_command *resp)

{
@@ -321,10 +305,6 @@ static inline int handle_cmd_response(struct lbs_private *priv, 
	case CMD_RET(CMD_802_11_BEACON_STOP):

		break;



	case CMD_RET(CMD_802_11_RATE_ADAPT_RATESET):

		ret = lbs_ret_802_11_rate_adapt_rateset(priv, resp);

		break;



	case CMD_RET(CMD_802_11_RSSI):

		ret = lbs_ret_802_11_rssi(priv, resp);

		break;

drivers/net/wireless/libertas/dev.h

+2 −3
Original line number Diff line number Diff line
@@ -237,8 +237,8 @@ struct lbs_private { 
	/** 802.11 statistics */

//	struct cmd_DS_802_11_GET_STAT wlan802_11Stat;



	u16 enablehwauto;

	u16 ratebitmap;

	uint16_t enablehwauto;

	uint16_t ratebitmap;



	u32 fragthsd;

	u32 rtsthsd;
@@ -296,7 +296,6 @@ struct lbs_private { 


	/** data rate stuff */

	u8 cur_rate;

	u8 auto_rate;



	/** RF calibration data */