Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

[linux-2.6-omap-h63xx.git] / drivers / net / wireless / libertas / assoc.c

diff --git a/drivers/net/wireless/libertas/assoc.c b/drivers/net/wireless/libertas/assoc.c
index c9c3640ce9fbb4978d4fd06cf06355f0b7da4faa..a267d6e65f03e82df3ef7f22403117a5fb3b003a 100644 (file)
--- a/drivers/net/wireless/libertas/assoc.c
+++ b/drivers/net/wireless/libertas/assoc.c
@@ -603,7 +603,8 @@ static int assoc_helper_channel(struct lbs_private *priv,
                /* 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_mesh_config(priv, CMD_ACT_MESH_CONFIG_STOP,
+                               assoc_req->channel);
        }
 
        lbs_deb_assoc("ASSOC: channel: %d -> %d\n",
@@ -642,7 +643,8 @@ static int assoc_helper_channel(struct lbs_private *priv,
 
  restore_mesh:
        if (priv->mesh_dev)
-               lbs_mesh_config(priv, 1, priv->curbssparams.channel);
+               lbs_mesh_config(priv, CMD_ACT_MESH_CONFIG_START,
+                               priv->curbssparams.channel);
 
  done:
        lbs_deb_leave_args(LBS_DEB_ASSOC, "ret %d", ret);
@@ -1248,7 +1250,7 @@ static int get_common_rates(struct lbs_private *priv,
        lbs_deb_hex(LBS_DEB_JOIN, "common rates", tmp, tmp_size);
        lbs_deb_join("TX data rate 0x%02x\n", priv->cur_rate);
 
-       if (!priv->auto_rate) {
+       if (!priv->enablehwauto) {
                for (i = 0; i < tmp_size; i++) {
                        if (tmp[i] == priv->cur_rate)
                                goto done;