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

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

libertas: disable mesh temporarily while setting eth channel/assoc 



Otherwise the device won't let us change channels.

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

drivers/net/wireless/libertas/assoc.c

+12 −2
Original line number Diff line number Diff line
@@ -204,6 +204,12 @@ static int assoc_helper_channel(struct lbs_private *priv, 
	if (assoc_req->channel == priv->curbssparams.channel)

		goto done;



	if (priv->mesh_dev) {

		/* Disconnect mesh while associating -- otherwise it

		   won't let us change channels */

		lbs_mesh_config(priv, 0);

	}



	lbs_deb_assoc("ASSOC: channel: %d -> %d\n",

	       priv->curbssparams.channel, assoc_req->channel);
@@ -221,7 +227,7 @@ static int assoc_helper_channel(struct lbs_private *priv, 
	if (assoc_req->channel != priv->curbssparams.channel) {

		lbs_deb_assoc("ASSOC: channel: failed to update channel to %d\n",

		              assoc_req->channel);

		goto done;

		goto restore_mesh;

	}



	if (   assoc_req->secinfo.wep_enabled
@@ -236,6 +242,10 @@ static int assoc_helper_channel(struct lbs_private *priv, 
	/* Must restart/rejoin adhoc networks after channel change */

	set_bit(ASSOC_FLAG_SSID, &assoc_req->flags);



 restore_mesh:

	if (priv->mesh_dev)

		lbs_mesh_config(priv, 1);



 done:

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

	return ret;