libertas: pass channel argument directly to lbs_mesh_config()

There is weirdness here; the firmware seems to refuse to change channels
at will.

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 6 insertions, 5 deletions

diff --git a/drivers/net/wireless/libertas/assoc.c b/drivers/net/wireless/libertas/assoc.c
index ff976ebcd014..cd8e043b16f4 100644
--- a/drivers/net/wireless/libertas/assoc.c
+++ b/drivers/net/wireless/libertas/assoc.c
@@ -205,13 +205,14 @@ static int assoc_helper_channel(struct lbs_private *priv,
                 goto done;
 
         if (priv->mesh_dev) {
-                /* Disconnect mesh while associating -- otherwise it
-                   won't let us change channels */
-                lbs_mesh_config(priv, 0);
+                /* Change mesh channel first; 21.p21 firmware won't let
+                   you change channel otherwise (even though it'll return
+                   an error to this */
+                lbs_mesh_config(priv, 0, assoc_req->channel);
         }
 
         lbs_deb_assoc("ASSOC: channel: %d -> %d\n",
-               priv->curbssparams.channel, assoc_req->channel);
+                      priv->curbssparams.channel, assoc_req->channel);
 
         ret = lbs_set_channel(priv, assoc_req->channel);
         if (ret < 0)
@@ -244,7 +245,7 @@ static int assoc_helper_channel(struct lbs_private *priv,
 
  restore_mesh:
         if (priv->mesh_dev)
-                lbs_mesh_config(priv, 1);
+                lbs_mesh_config(priv, 1, priv->curbssparams.channel);
 
  done:
         lbs_deb_leave_args(LBS_DEB_ASSOC, "ret %d", ret);