diff options
| author | David Woodhouse | 2007-12-12 02:03:01 +0100 |
|---|---|---|
| committer | David S. Miller | 2008-01-29 00:06:58 +0100 |
| commit | 8642f1f06292c4f30c7870a693f9ae94252e7ff2 (patch) | |
| tree | a62594a6554b11d0b7da0ac6a17e067e43749350 | |
| parent | libertas: add missing newline on debug message (diff) | |
| download | kernel-qcow2-linux-8642f1f06292c4f30c7870a693f9ae94252e7ff2.tar.gz kernel-qcow2-linux-8642f1f06292c4f30c7870a693f9ae94252e7ff2.tar.xz kernel-qcow2-linux-8642f1f06292c4f30c7870a693f9ae94252e7ff2.zip | |
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>
| -rw-r--r-- | drivers/net/wireless/libertas/assoc.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/drivers/net/wireless/libertas/assoc.c b/drivers/net/wireless/libertas/assoc.c index a4b9756ebb7f..7b672fe62cf9 100644 --- a/drivers/net/wireless/libertas/assoc.c +++ b/drivers/net/wireless/libertas/assoc.c @@ -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,7 +242,11 @@ 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); -done: + restore_mesh: + if (priv->mesh_dev) + lbs_mesh_config(priv, 1); + + done: lbs_deb_leave_args(LBS_DEB_ASSOC, "ret %d", ret); return ret; } |