mirror of
https://github.com/torvalds/linux
synced 2024-09-23 12:56:39 +00:00
libertas: disable mesh temporarily while setting eth channel/assoc
Otherwise the device won't let us change channels. Signed-off-by: David Woodhouse <dwmw2@infradead.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
parent
88ae2915cc
commit
8642f1f062
|
@ -204,6 +204,12 @@ static int assoc_helper_channel(struct lbs_private *priv,
|
||||||
if (assoc_req->channel == priv->curbssparams.channel)
|
if (assoc_req->channel == priv->curbssparams.channel)
|
||||||
goto done;
|
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",
|
lbs_deb_assoc("ASSOC: channel: %d -> %d\n",
|
||||||
priv->curbssparams.channel, assoc_req->channel);
|
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) {
|
if (assoc_req->channel != priv->curbssparams.channel) {
|
||||||
lbs_deb_assoc("ASSOC: channel: failed to update channel to %d\n",
|
lbs_deb_assoc("ASSOC: channel: failed to update channel to %d\n",
|
||||||
assoc_req->channel);
|
assoc_req->channel);
|
||||||
goto done;
|
goto restore_mesh;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( assoc_req->secinfo.wep_enabled
|
if ( assoc_req->secinfo.wep_enabled
|
||||||
|
@ -236,7 +242,11 @@ static int assoc_helper_channel(struct lbs_private *priv,
|
||||||
/* Must restart/rejoin adhoc networks after channel change */
|
/* Must restart/rejoin adhoc networks after channel change */
|
||||||
set_bit(ASSOC_FLAG_SSID, &assoc_req->flags);
|
set_bit(ASSOC_FLAG_SSID, &assoc_req->flags);
|
||||||
|
|
||||||
done:
|
restore_mesh:
|
||||||
|
if (priv->mesh_dev)
|
||||||
|
lbs_mesh_config(priv, 1);
|
||||||
|
|
||||||
|
done:
|
||||||
lbs_deb_leave_args(LBS_DEB_ASSOC, "ret %d", ret);
|
lbs_deb_leave_args(LBS_DEB_ASSOC, "ret %d", ret);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue