From 08a74ac4dd5eb599e7e0e9dedffa60c00386df32 Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Tue, 11 Dec 2007 20:03:01 -0500 Subject: [PATCH] --- yaml --- r: 79183 b: refs/heads/master c: 8642f1f06292c4f30c7870a693f9ae94252e7ff2 h: refs/heads/master i: 79181: 63facec6a942eb4312771ca74b0281d4abcd6b3a 79179: 16ee5346a9c6c0e2ced9b941cb961b28c0ff66cf 79175: b543e71f1c3463fa8fbc0c525ae0198758feba18 79167: 9a2fa39743f4faef96f7570869695d6ab083314c v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/libertas/assoc.c | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6fbe6cb6f236..dd3217c94497 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 88ae2915ccff97466e7a1e542f4a4d01c46b23f6 +refs/heads/master: 8642f1f06292c4f30c7870a693f9ae94252e7ff2 diff --git a/trunk/drivers/net/wireless/libertas/assoc.c b/trunk/drivers/net/wireless/libertas/assoc.c index a4b9756ebb7f..7b672fe62cf9 100644 --- a/trunk/drivers/net/wireless/libertas/assoc.c +++ b/trunk/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; }