Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=8642f1f06292c4f30c7870a693f9ae94252e7ff2
Commit: 8642f1f06292c4f30c7870a693f9ae94252e7ff2
Parent: 88ae2915ccff97466e7a1e542f4a4d01c46b23f6
Author: David Woodhouse <[EMAIL PROTECTED]>
AuthorDate: Tue Dec 11 20:03:01 2007 -0500
Committer: David S. Miller <[EMAIL PROTECTED]>
CommitDate: Mon Jan 28 15:06:58 2008 -0800
libertas: disable mesh temporarily while setting eth channel/assoc
Otherwise the device won't let us change channels.
Signed-off-by: David Woodhouse <[EMAIL PROTECTED]>
Signed-off-by: John W. Linville <[EMAIL PROTECTED]>
---
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 a4b9756..7b672fe 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;
}
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
