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

Commit 86062134 authored by David Woodhouse's avatar David Woodhouse Committed by David S. Miller
Browse files

libertas: pass channel argument directly to lbs_mesh_config() 



There is weirdness here; the firmware seems to refuse to change channels
at will.

Signed-off-by: default avatarDavid Woodhouse <dwmw2@infradead.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 020f3d00

drivers/net/wireless/libertas/assoc.c

+6 −5
Original line number Diff line number Diff line
@@ -205,9 +205,10 @@ static int assoc_helper_channel(struct lbs_private *priv, 
		goto done;



	if (priv->mesh_dev) {

		/* Disconnect mesh while associating -- otherwise it

		   won't let us change channels */

		lbs_mesh_config(priv, 0);

		/* Change mesh channel first; 21.p21 firmware won't let

		   you change channel otherwise (even though it'll return

		   an error to this */

		lbs_mesh_config(priv, 0, assoc_req->channel);

	}



	lbs_deb_assoc("ASSOC: channel: %d -> %d\n",
@@ -244,7 +245,7 @@ static int assoc_helper_channel(struct lbs_private *priv, 


 restore_mesh:

	if (priv->mesh_dev)

		lbs_mesh_config(priv, 1);

		lbs_mesh_config(priv, 1, priv->curbssparams.channel);



 done:

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

drivers/net/wireless/libertas/cmd.c

+3 −3
Original line number Diff line number Diff line
@@ -1114,13 +1114,13 @@ int lbs_mesh_access(struct lbs_private *priv, uint16_t cmd_action, 
}

EXPORT_SYMBOL_GPL(lbs_mesh_access);



int lbs_mesh_config(struct lbs_private *priv, int enable)

int lbs_mesh_config(struct lbs_private *priv, uint16_t enable, uint16_t chan)

{

	struct cmd_ds_mesh_config cmd;



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

	cmd.action = cpu_to_le16(enable);

	cmd.channel = cpu_to_le16(priv->curbssparams.channel);

	cmd.channel = cpu_to_le16(chan);

	cmd.type = cpu_to_le16(priv->mesh_tlv);

	

	if (enable) {
@@ -1128,7 +1128,7 @@ int lbs_mesh_config(struct lbs_private *priv, int enable) 
		memcpy(cmd.data, priv->mesh_ssid, priv->mesh_ssid_len);

	}

	lbs_deb_cmd("mesh config enable %d TLV %x channel %d SSID %s\n",

		    enable, priv->mesh_tlv, priv->curbssparams.channel,

		    enable, priv->mesh_tlv, chan,

		    escape_essid(priv->mesh_ssid, priv->mesh_ssid_len));

	return lbs_cmd_with_response(priv, CMD_MESH_CONFIG, &cmd);

}

drivers/net/wireless/libertas/cmd.h

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ int lbs_set_data_rate(struct lbs_private *priv, u8 rate); 
int lbs_get_channel(struct lbs_private *priv);

int lbs_set_channel(struct lbs_private *priv, u8 channel);



int lbs_mesh_config(struct lbs_private *priv, int enable);

int lbs_mesh_config(struct lbs_private *priv, uint16_t enable, uint16_t chan);



int lbs_host_sleep_cfg(struct lbs_private *priv, uint32_t criteria);

int lbs_suspend(struct lbs_private *priv);

drivers/net/wireless/libertas/main.c

+3 −3
Original line number Diff line number Diff line
@@ -344,7 +344,7 @@ static ssize_t lbs_mesh_set(struct device *dev, 
	if (enable == !!priv->mesh_dev)

		return count;



	ret = lbs_mesh_config(priv, enable);

	ret = lbs_mesh_config(priv, enable, priv->curbssparams.channel);

	if (ret)

		return ret;
@@ -1187,9 +1187,9 @@ int lbs_start_card(struct lbs_private *priv) 


	lbs_update_channel(priv);

	priv->mesh_tlv = 0x100 + 291;

	if (lbs_mesh_config(priv, 1)) {

	if (lbs_mesh_config(priv, 1, priv->curbssparams.channel)) {

		priv->mesh_tlv = 0x100 + 37;

		if (lbs_mesh_config(priv, 1))

		if (lbs_mesh_config(priv, 1, priv->curbssparams.channel))

			priv->mesh_tlv = 0;

	}

	if (priv->mesh_tlv) {

drivers/net/wireless/libertas/wext.c

+3 −4
Original line number Diff line number Diff line
@@ -1000,9 +1000,8 @@ static int lbs_mesh_set_freq(struct net_device *dev, 
		else if (priv->mode == IW_MODE_ADHOC)

			lbs_stop_adhoc_network(priv);

	}

	priv->curbssparams.channel = fwrq->m;

	lbs_mesh_config(priv, 0);

	lbs_mesh_config(priv, 1);

	lbs_mesh_config(priv, 1, fwrq->m);

	lbs_update_channel(priv);

	ret = 0;



out:
@@ -2010,7 +2009,7 @@ static int lbs_mesh_set_essid(struct net_device *dev, 
		priv->mesh_ssid_len = dwrq->length;

	}



	lbs_mesh_config(priv, 1);

	lbs_mesh_config(priv, 1, priv->curbssparams.channel);

 out:

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

	return ret;