libertas: convert sleep/wake config direct commands
[safe/jmp/linux-2.6] / drivers / net / wireless / libertas / cmdresp.c
index 20ca38c..e60d03b 100644 (file)
  */
 void lbs_mac_event_disconnected(struct lbs_private *priv)
 {
-       struct lbs_adapter *adapter = priv->adapter;
        union iwreq_data wrqu;
 
-       if (adapter->connect_status != LBS_CONNECTED)
+       if (priv->connect_status != LBS_CONNECTED)
                return;
 
        lbs_deb_enter(LBS_DEB_ASSOC);
@@ -44,37 +43,38 @@ void lbs_mac_event_disconnected(struct lbs_private *priv)
        msleep_interruptible(1000);
        wireless_send_event(priv->dev, SIOCGIWAP, &wrqu, NULL);
 
-       /* Free Tx and Rx packets */
-       kfree_skb(priv->adapter->currenttxskb);
-       priv->adapter->currenttxskb = NULL;
-
        /* report disconnect to upper layer */
        netif_stop_queue(priv->dev);
        netif_carrier_off(priv->dev);
 
+       /* Free Tx and Rx packets */
+       kfree_skb(priv->currenttxskb);
+       priv->currenttxskb = NULL;
+       priv->tx_pending_len = 0;
+
        /* reset SNR/NF/RSSI values */
-       memset(adapter->SNR, 0x00, sizeof(adapter->SNR));
-       memset(adapter->NF, 0x00, sizeof(adapter->NF));
-       memset(adapter->RSSI, 0x00, sizeof(adapter->RSSI));
-       memset(adapter->rawSNR, 0x00, sizeof(adapter->rawSNR));
-       memset(adapter->rawNF, 0x00, sizeof(adapter->rawNF));
-       adapter->nextSNRNF = 0;
-       adapter->numSNRNF = 0;
-       adapter->connect_status = LBS_DISCONNECTED;
+       memset(priv->SNR, 0x00, sizeof(priv->SNR));
+       memset(priv->NF, 0x00, sizeof(priv->NF));
+       memset(priv->RSSI, 0x00, sizeof(priv->RSSI));
+       memset(priv->rawSNR, 0x00, sizeof(priv->rawSNR));
+       memset(priv->rawNF, 0x00, sizeof(priv->rawNF));
+       priv->nextSNRNF = 0;
+       priv->numSNRNF = 0;
+       priv->connect_status = LBS_DISCONNECTED;
 
        /* Clear out associated SSID and BSSID since connection is
         * no longer valid.
         */
-       memset(&adapter->curbssparams.bssid, 0, ETH_ALEN);
-       memset(&adapter->curbssparams.ssid, 0, IW_ESSID_MAX_SIZE);
-       adapter->curbssparams.ssid_len = 0;
+       memset(&priv->curbssparams.bssid, 0, ETH_ALEN);
+       memset(&priv->curbssparams.ssid, 0, IW_ESSID_MAX_SIZE);
+       priv->curbssparams.ssid_len = 0;
 
-       if (adapter->psstate != PS_STATE_FULL_POWER) {
+       if (priv->psstate != PS_STATE_FULL_POWER) {
                /* make firmware to exit PS mode */
                lbs_deb_cmd("disconnected, so exit PS mode\n");
                lbs_ps_wakeup(priv, 0);
        }
-       lbs_deb_leave(LBS_DEB_CMD);
+       lbs_deb_leave(LBS_DEB_ASSOC);
 }
 
 /**
@@ -107,7 +107,6 @@ static int lbs_ret_reg_access(struct lbs_private *priv,
                               u16 type, struct cmd_ds_command *resp)
 {
        int ret = 0;
-       struct lbs_adapter *adapter = priv->adapter;
 
        lbs_deb_enter(LBS_DEB_CMD);
 
@@ -116,8 +115,8 @@ static int lbs_ret_reg_access(struct lbs_private *priv,
                {
                        struct cmd_ds_mac_reg_access *reg = &resp->params.macreg;
 
-                       adapter->offsetvalue.offset = (u32)le16_to_cpu(reg->offset);
-                       adapter->offsetvalue.value = le32_to_cpu(reg->value);
+                       priv->offsetvalue.offset = (u32)le16_to_cpu(reg->offset);
+                       priv->offsetvalue.value = le32_to_cpu(reg->value);
                        break;
                }
 
@@ -125,8 +124,8 @@ static int lbs_ret_reg_access(struct lbs_private *priv,
                {
                        struct cmd_ds_bbp_reg_access *reg = &resp->params.bbpreg;
 
-                       adapter->offsetvalue.offset = (u32)le16_to_cpu(reg->offset);
-                       adapter->offsetvalue.value = reg->value;
+                       priv->offsetvalue.offset = (u32)le16_to_cpu(reg->offset);
+                       priv->offsetvalue.value = reg->value;
                        break;
                }
 
@@ -134,8 +133,8 @@ static int lbs_ret_reg_access(struct lbs_private *priv,
                {
                        struct cmd_ds_rf_reg_access *reg = &resp->params.rfreg;
 
-                       adapter->offsetvalue.offset = (u32)le16_to_cpu(reg->offset);
-                       adapter->offsetvalue.value = reg->value;
+                       priv->offsetvalue.offset = (u32)le16_to_cpu(reg->offset);
+                       priv->offsetvalue.value = reg->value;
                        break;
                }
 
@@ -147,111 +146,6 @@ static int lbs_ret_reg_access(struct lbs_private *priv,
        return ret;
 }
 
-static int lbs_ret_get_hw_spec(struct lbs_private *priv,
-                               struct cmd_ds_command *resp)
-{
-       u32 i;
-       struct cmd_ds_get_hw_spec *hwspec = &resp->params.hwspec;
-       struct lbs_adapter *adapter = priv->adapter;
-       int ret = 0;
-       DECLARE_MAC_BUF(mac);
-
-       lbs_deb_enter(LBS_DEB_CMD);
-
-       adapter->fwcapinfo = le32_to_cpu(hwspec->fwcapinfo);
-
-       memcpy(adapter->fwreleasenumber, hwspec->fwreleasenumber, 4);
-
-       lbs_deb_cmd("GET_HW_SPEC: firmware release %u.%u.%up%u\n",
-                   adapter->fwreleasenumber[2], adapter->fwreleasenumber[1],
-                   adapter->fwreleasenumber[0], adapter->fwreleasenumber[3]);
-       lbs_deb_cmd("GET_HW_SPEC: MAC addr %s\n",
-                   print_mac(mac, hwspec->permanentaddr));
-       lbs_deb_cmd("GET_HW_SPEC: hardware interface 0x%x, hardware spec 0x%04x\n",
-              hwspec->hwifversion, hwspec->version);
-
-       /* Clamp region code to 8-bit since FW spec indicates that it should
-        * only ever be 8-bit, even though the field size is 16-bit.  Some firmware
-        * returns non-zero high 8 bits here.
-        */
-       adapter->regioncode = le16_to_cpu(hwspec->regioncode) & 0xFF;
-
-       for (i = 0; i < MRVDRV_MAX_REGION_CODE; i++) {
-               /* use the region code to search for the index */
-               if (adapter->regioncode == lbs_region_code_to_index[i]) {
-                       break;
-               }
-       }
-
-       /* if it's unidentified region code, use the default (USA) */
-       if (i >= MRVDRV_MAX_REGION_CODE) {
-               adapter->regioncode = 0x10;
-               lbs_pr_info("unidentified region code; using the default (USA)\n");
-       }
-
-       if (adapter->current_addr[0] == 0xff)
-               memmove(adapter->current_addr, hwspec->permanentaddr, ETH_ALEN);
-
-       memcpy(priv->dev->dev_addr, adapter->current_addr, ETH_ALEN);
-       if (priv->mesh_dev)
-               memcpy(priv->mesh_dev->dev_addr, adapter->current_addr, ETH_ALEN);
-
-       if (lbs_set_regiontable(priv, adapter->regioncode, 0)) {
-               ret = -1;
-               goto done;
-       }
-
-       if (lbs_set_universaltable(priv, 0)) {
-               ret = -1;
-               goto done;
-       }
-
-done:
-       lbs_deb_enter_args(LBS_DEB_CMD, "ret %d", ret);
-       return ret;
-}
-
-static int lbs_ret_802_11_sleep_params(struct lbs_private *priv,
-                                       struct cmd_ds_command *resp)
-{
-       struct cmd_ds_802_11_sleep_params *sp = &resp->params.sleep_params;
-       struct lbs_adapter *adapter = priv->adapter;
-
-       lbs_deb_enter(LBS_DEB_CMD);
-
-       lbs_deb_cmd("error 0x%x, offset 0x%x, stabletime 0x%x, calcontrol 0x%x "
-                   "extsleepclk 0x%x\n", le16_to_cpu(sp->error),
-                   le16_to_cpu(sp->offset), le16_to_cpu(sp->stabletime),
-                   sp->calcontrol, sp->externalsleepclk);
-
-       adapter->sp.sp_error = le16_to_cpu(sp->error);
-       adapter->sp.sp_offset = le16_to_cpu(sp->offset);
-       adapter->sp.sp_stabletime = le16_to_cpu(sp->stabletime);
-       adapter->sp.sp_calcontrol = sp->calcontrol;
-       adapter->sp.sp_extsleepclk = sp->externalsleepclk;
-       adapter->sp.sp_reserved = le16_to_cpu(sp->reserved);
-
-       lbs_deb_enter(LBS_DEB_CMD);
-       return 0;
-}
-
-static int lbs_ret_802_11_stat(struct lbs_private *priv,
-                               struct cmd_ds_command *resp)
-{
-       lbs_deb_enter(LBS_DEB_CMD);
-/*     currently adapter->wlan802_11Stat is unused
-
-       struct cmd_ds_802_11_get_stat *p11Stat = &resp->params.gstat;
-       struct lbs_adapter *adapter = priv->adapter;
-
-       // TODO Convert it to Big endian befor copy
-       memcpy(&adapter->wlan802_11Stat,
-              p11Stat, sizeof(struct cmd_ds_802_11_get_stat));
-*/
-       lbs_deb_leave(LBS_DEB_CMD);
-       return 0;
-}
-
 static int lbs_ret_802_11_snmp_mib(struct lbs_private *priv,
                                    struct cmd_ds_command *resp)
 {
@@ -268,22 +162,22 @@ static int lbs_ret_802_11_snmp_mib(struct lbs_private *priv,
        if (querytype == CMD_ACT_GET) {
                switch (oid) {
                case FRAGTHRESH_I:
-                       priv->adapter->fragthsd =
+                       priv->fragthsd =
                                le16_to_cpu(*((__le16 *)(smib->value)));
                        lbs_deb_cmd("SNMP_RESP: frag threshold %u\n",
-                                   priv->adapter->fragthsd);
+                                   priv->fragthsd);
                        break;
                case RTSTHRESH_I:
-                       priv->adapter->rtsthsd =
+                       priv->rtsthsd =
                                le16_to_cpu(*((__le16 *)(smib->value)));
                        lbs_deb_cmd("SNMP_RESP: rts threshold %u\n",
-                                   priv->adapter->rtsthsd);
+                                   priv->rtsthsd);
                        break;
                case SHORT_RETRYLIM_I:
-                       priv->adapter->txretrycount =
+                       priv->txretrycount =
                                le16_to_cpu(*((__le16 *)(smib->value)));
                        lbs_deb_cmd("SNMP_RESP: tx retry count %u\n",
-                                   priv->adapter->rtsthsd);
+                                   priv->rtsthsd);
                        break;
                default:
                        break;
@@ -294,87 +188,16 @@ static int lbs_ret_802_11_snmp_mib(struct lbs_private *priv,
        return 0;
 }
 
-static int lbs_ret_802_11_key_material(struct lbs_private *priv,
-                                       struct cmd_ds_command *resp)
-{
-       struct cmd_ds_802_11_key_material *pkeymaterial =
-           &resp->params.keymaterial;
-       struct lbs_adapter *adapter = priv->adapter;
-       u16 action = le16_to_cpu(pkeymaterial->action);
-
-       lbs_deb_enter(LBS_DEB_CMD);
-
-       /* Copy the returned key to driver private data */
-       if (action == CMD_ACT_GET) {
-               u8 * buf_ptr = (u8 *) &pkeymaterial->keyParamSet;
-               u8 * resp_end = (u8 *) (resp + le16_to_cpu(resp->size));
-
-               while (buf_ptr < resp_end) {
-                       struct MrvlIEtype_keyParamSet * pkeyparamset =
-                           (struct MrvlIEtype_keyParamSet *) buf_ptr;
-                       struct enc_key * pkey;
-                       u16 param_set_len = le16_to_cpu(pkeyparamset->length);
-                       u16 key_len = le16_to_cpu(pkeyparamset->keylen);
-                       u16 key_flags = le16_to_cpu(pkeyparamset->keyinfo);
-                       u16 key_type = le16_to_cpu(pkeyparamset->keytypeid);
-                       u8 * end;
-
-                       end = (u8 *) pkeyparamset + sizeof (pkeyparamset->type)
-                                                 + sizeof (pkeyparamset->length)
-                                                 + param_set_len;
-                       /* Make sure we don't access past the end of the IEs */
-                       if (end > resp_end)
-                               break;
-
-                       if (key_flags & KEY_INFO_WPA_UNICAST)
-                               pkey = &adapter->wpa_unicast_key;
-                       else if (key_flags & KEY_INFO_WPA_MCAST)
-                               pkey = &adapter->wpa_mcast_key;
-                       else
-                               break;
-
-                       /* Copy returned key into driver */
-                       memset(pkey, 0, sizeof(struct enc_key));
-                       if (key_len > sizeof(pkey->key))
-                               break;
-                       pkey->type = key_type;
-                       pkey->flags = key_flags;
-                       pkey->len = key_len;
-                       memcpy(pkey->key, pkeyparamset->key, pkey->len);
-
-                       buf_ptr = end + 1;
-               }
-       }
-
-       lbs_deb_enter(LBS_DEB_CMD);
-       return 0;
-}
-
-static int lbs_ret_802_11_mac_address(struct lbs_private *priv,
-                                      struct cmd_ds_command *resp)
-{
-       struct cmd_ds_802_11_mac_address *macadd = &resp->params.macadd;
-       struct lbs_adapter *adapter = priv->adapter;
-
-       lbs_deb_enter(LBS_DEB_CMD);
-
-       memcpy(adapter->current_addr, macadd->macadd, ETH_ALEN);
-
-       lbs_deb_enter(LBS_DEB_CMD);
-       return 0;
-}
-
 static int lbs_ret_802_11_rf_tx_power(struct lbs_private *priv,
                                       struct cmd_ds_command *resp)
 {
        struct cmd_ds_802_11_rf_tx_power *rtp = &resp->params.txp;
-       struct lbs_adapter *adapter = priv->adapter;
 
        lbs_deb_enter(LBS_DEB_CMD);
 
-       adapter->txpowerlevel = le16_to_cpu(rtp->currentlevel);
+       priv->txpowerlevel = le16_to_cpu(rtp->currentlevel);
 
-       lbs_deb_cmd("TX power currently %d\n", adapter->txpowerlevel);
+       lbs_deb_cmd("TX power currently %d\n", priv->txpowerlevel);
 
        lbs_deb_leave(LBS_DEB_CMD);
        return 0;
@@ -384,148 +207,43 @@ static int lbs_ret_802_11_rate_adapt_rateset(struct lbs_private *priv,
                                              struct cmd_ds_command *resp)
 {
        struct cmd_ds_802_11_rate_adapt_rateset *rates = &resp->params.rateset;
-       struct lbs_adapter *adapter = priv->adapter;
 
        lbs_deb_enter(LBS_DEB_CMD);
 
        if (rates->action == CMD_ACT_GET) {
-               adapter->enablehwauto = le16_to_cpu(rates->enablehwauto);
-               adapter->ratebitmap = le16_to_cpu(rates->bitmap);
+               priv->enablehwauto = le16_to_cpu(rates->enablehwauto);
+               priv->ratebitmap = le16_to_cpu(rates->bitmap);
        }
 
        lbs_deb_leave(LBS_DEB_CMD);
        return 0;
 }
 
-static int lbs_ret_802_11_data_rate(struct lbs_private *priv,
-                                    struct cmd_ds_command *resp)
-{
-       struct cmd_ds_802_11_data_rate *pdatarate = &resp->params.drate;
-       struct lbs_adapter *adapter = priv->adapter;
-
-       lbs_deb_enter(LBS_DEB_CMD);
-
-       lbs_deb_hex(LBS_DEB_CMD, "DATA_RATE_RESP", (u8 *) pdatarate,
-               sizeof(struct cmd_ds_802_11_data_rate));
-
-       /* FIXME: get actual rates FW can do if this command actually returns
-        * all data rates supported.
-        */
-       adapter->cur_rate = lbs_fw_index_to_data_rate(pdatarate->rates[0]);
-       lbs_deb_cmd("DATA_RATE: current rate 0x%02x\n", adapter->cur_rate);
-
-       lbs_deb_leave(LBS_DEB_CMD);
-       return 0;
-}
-
-static int lbs_ret_802_11_rf_channel(struct lbs_private *priv,
-                                     struct cmd_ds_command *resp)
-{
-       struct cmd_ds_802_11_rf_channel *rfchannel = &resp->params.rfchannel;
-       struct lbs_adapter *adapter = priv->adapter;
-       u16 action = le16_to_cpu(rfchannel->action);
-       u16 newchannel = le16_to_cpu(rfchannel->currentchannel);
-
-       lbs_deb_enter(LBS_DEB_CMD);
-
-       if (action == CMD_OPT_802_11_RF_CHANNEL_GET
-           && adapter->curbssparams.channel != newchannel) {
-               lbs_deb_cmd("channel switch from %d to %d\n",
-                      adapter->curbssparams.channel, newchannel);
-
-               /* Update the channel again */
-               adapter->curbssparams.channel = newchannel;
-       }
-
-       lbs_deb_enter(LBS_DEB_CMD);
-       return 0;
-}
-
 static int lbs_ret_802_11_rssi(struct lbs_private *priv,
                                struct cmd_ds_command *resp)
 {
        struct cmd_ds_802_11_rssi_rsp *rssirsp = &resp->params.rssirsp;
-       struct lbs_adapter *adapter = priv->adapter;
 
        lbs_deb_enter(LBS_DEB_CMD);
 
        /* store the non average value */
-       adapter->SNR[TYPE_BEACON][TYPE_NOAVG] = le16_to_cpu(rssirsp->SNR);
-       adapter->NF[TYPE_BEACON][TYPE_NOAVG] = le16_to_cpu(rssirsp->noisefloor);
+       priv->SNR[TYPE_BEACON][TYPE_NOAVG] = le16_to_cpu(rssirsp->SNR);
+       priv->NF[TYPE_BEACON][TYPE_NOAVG] = le16_to_cpu(rssirsp->noisefloor);
 
-       adapter->SNR[TYPE_BEACON][TYPE_AVG] = le16_to_cpu(rssirsp->avgSNR);
-       adapter->NF[TYPE_BEACON][TYPE_AVG] = le16_to_cpu(rssirsp->avgnoisefloor);
+       priv->SNR[TYPE_BEACON][TYPE_AVG] = le16_to_cpu(rssirsp->avgSNR);
+       priv->NF[TYPE_BEACON][TYPE_AVG] = le16_to_cpu(rssirsp->avgnoisefloor);
 
-       adapter->RSSI[TYPE_BEACON][TYPE_NOAVG] =
-           CAL_RSSI(adapter->SNR[TYPE_BEACON][TYPE_NOAVG],
-                    adapter->NF[TYPE_BEACON][TYPE_NOAVG]);
+       priv->RSSI[TYPE_BEACON][TYPE_NOAVG] =
+           CAL_RSSI(priv->SNR[TYPE_BEACON][TYPE_NOAVG],
+                    priv->NF[TYPE_BEACON][TYPE_NOAVG]);
 
-       adapter->RSSI[TYPE_BEACON][TYPE_AVG] =
-           CAL_RSSI(adapter->SNR[TYPE_BEACON][TYPE_AVG] / AVG_SCALE,
-                    adapter->NF[TYPE_BEACON][TYPE_AVG] / AVG_SCALE);
+       priv->RSSI[TYPE_BEACON][TYPE_AVG] =
+           CAL_RSSI(priv->SNR[TYPE_BEACON][TYPE_AVG] / AVG_SCALE,
+                    priv->NF[TYPE_BEACON][TYPE_AVG] / AVG_SCALE);
 
        lbs_deb_cmd("RSSI: beacon %d, avg %d\n",
-              adapter->RSSI[TYPE_BEACON][TYPE_NOAVG],
-              adapter->RSSI[TYPE_BEACON][TYPE_AVG]);
-
-       lbs_deb_leave(LBS_DEB_CMD);
-       return 0;
-}
-
-static int lbs_ret_802_11_eeprom_access(struct lbs_private *priv,
-                                 struct cmd_ds_command *resp)
-{
-       struct lbs_adapter *adapter = priv->adapter;
-       struct lbs_ioctl_regrdwr *pbuf;
-       pbuf = (struct lbs_ioctl_regrdwr *) adapter->prdeeprom;
-
-       lbs_deb_enter_args(LBS_DEB_CMD, "len %d",
-              le16_to_cpu(resp->params.rdeeprom.bytecount));
-       if (pbuf->NOB < le16_to_cpu(resp->params.rdeeprom.bytecount)) {
-               pbuf->NOB = 0;
-               lbs_deb_cmd("EEPROM read length too big\n");
-               return -1;
-       }
-       pbuf->NOB = le16_to_cpu(resp->params.rdeeprom.bytecount);
-       if (pbuf->NOB > 0) {
-
-               memcpy(&pbuf->value, (u8 *) & resp->params.rdeeprom.value,
-                      le16_to_cpu(resp->params.rdeeprom.bytecount));
-               lbs_deb_hex(LBS_DEB_CMD, "EEPROM", (char *)&pbuf->value,
-                       le16_to_cpu(resp->params.rdeeprom.bytecount));
-       }
-       lbs_deb_leave(LBS_DEB_CMD);
-       return 0;
-}
-
-static int lbs_ret_get_log(struct lbs_private *priv,
-                           struct cmd_ds_command *resp)
-{
-       struct cmd_ds_802_11_get_log *logmessage = &resp->params.glog;
-       struct lbs_adapter *adapter = priv->adapter;
-
-       lbs_deb_enter(LBS_DEB_CMD);
-
-       /* Stored little-endian */
-       memcpy(&adapter->logmsg, logmessage, sizeof(struct cmd_ds_802_11_get_log));
-
-       lbs_deb_leave(LBS_DEB_CMD);
-       return 0;
-}
-
-static int lbs_ret_802_11_enable_rsn(struct lbs_private *priv,
-                                          struct cmd_ds_command *resp)
-{
-       struct cmd_ds_802_11_enable_rsn *enable_rsn = &resp->params.enbrsn;
-       struct lbs_adapter *adapter = priv->adapter;
-       u32 * pdata_buf = adapter->cur_cmd->pdata_buf;
-
-       lbs_deb_enter(LBS_DEB_CMD);
-
-       if (enable_rsn->action == cpu_to_le16(CMD_ACT_GET)) {
-               if (pdata_buf)
-                       *pdata_buf = (u32) le16_to_cpu(enable_rsn->enable);
-       }
+              priv->RSSI[TYPE_BEACON][TYPE_NOAVG],
+              priv->RSSI[TYPE_BEACON][TYPE_AVG]);
 
        lbs_deb_leave(LBS_DEB_CMD);
        return 0;
@@ -536,46 +254,25 @@ static int lbs_ret_802_11_bcn_ctrl(struct lbs_private * priv,
 {
        struct cmd_ds_802_11_beacon_control *bcn_ctrl =
            &resp->params.bcn_ctrl;
-       struct lbs_adapter *adapter = priv->adapter;
 
        lbs_deb_enter(LBS_DEB_CMD);
 
        if (bcn_ctrl->action == CMD_ACT_GET) {
-               adapter->beacon_enable = (u8) le16_to_cpu(bcn_ctrl->beacon_enable);
-               adapter->beacon_period = le16_to_cpu(bcn_ctrl->beacon_period);
+               priv->beacon_enable = (u8) le16_to_cpu(bcn_ctrl->beacon_enable);
+               priv->beacon_period = le16_to_cpu(bcn_ctrl->beacon_period);
        }
 
        lbs_deb_enter(LBS_DEB_CMD);
        return 0;
 }
 
-static int lbs_ret_802_11_subscribe_event(struct lbs_private *priv,
-       struct cmd_ds_command *resp)
-{
-       struct lbs_adapter *adapter = priv->adapter;
-       struct cmd_ds_802_11_subscribe_event *cmd_event =
-               &resp->params.subscribe_event;
-       struct cmd_ds_802_11_subscribe_event *dst_event =
-               adapter->cur_cmd->pdata_buf;
-
-       lbs_deb_enter(LBS_DEB_CMD);
-
-       if (dst_event->action == cpu_to_le16(CMD_ACT_GET)) {
-               dst_event->events = le16_to_cpu(cmd_event->events);
-               memcpy(dst_event->tlv, cmd_event->tlv, sizeof(dst_event->tlv));
-       }
-
-       lbs_deb_leave(LBS_DEB_CMD);
-       return 0;
-}
-
-static inline int handle_cmd_response(u16 respcmd,
-                                     struct cmd_ds_command *resp,
-                                     struct lbs_private *priv)
+static inline int handle_cmd_response(struct lbs_private *priv,
+                                     struct cmd_header *cmd_response)
 {
+       struct cmd_ds_command *resp = (struct cmd_ds_command *) cmd_response;
        int ret = 0;
        unsigned long flags;
-       struct lbs_adapter *adapter = priv->adapter;
+       uint16_t respcmd = le16_to_cpu(resp->command);
 
        lbs_deb_enter(LBS_DEB_HOST);
 
@@ -586,18 +283,6 @@ static inline int handle_cmd_response(u16 respcmd,
                ret = lbs_ret_reg_access(priv, respcmd, resp);
                break;
 
-       case CMD_RET(CMD_GET_HW_SPEC):
-               ret = lbs_ret_get_hw_spec(priv, resp);
-               break;
-
-       case CMD_RET(CMD_802_11_SCAN):
-               ret = lbs_ret_80211_scan(priv, resp);
-               break;
-
-       case CMD_RET(CMD_802_11_GET_LOG):
-               ret = lbs_ret_get_log(priv, resp);
-               break;
-
        case CMD_RET_802_11_ASSOCIATE:
        case CMD_RET(CMD_802_11_ASSOCIATE):
        case CMD_RET(CMD_802_11_REASSOCIATE):
@@ -606,7 +291,7 @@ static inline int handle_cmd_response(u16 respcmd,
 
        case CMD_RET(CMD_802_11_DISASSOCIATE):
        case CMD_RET(CMD_802_11_DEAUTHENTICATE):
-               ret = lbs_ret_80211_disassociate(priv, resp);
+               ret = lbs_ret_80211_disassociate(priv);
                break;
 
        case CMD_RET(CMD_802_11_AD_HOC_START):
@@ -614,10 +299,6 @@ static inline int handle_cmd_response(u16 respcmd,
                ret = lbs_ret_80211_ad_hoc_start(priv, resp);
                break;
 
-       case CMD_RET(CMD_802_11_GET_STAT):
-               ret = lbs_ret_802_11_stat(priv, resp);
-               break;
-
        case CMD_RET(CMD_802_11_SNMP_MIB):
                ret = lbs_ret_802_11_snmp_mib(priv, resp);
                break;
@@ -628,118 +309,67 @@ static inline int handle_cmd_response(u16 respcmd,
 
        case CMD_RET(CMD_802_11_SET_AFC):
        case CMD_RET(CMD_802_11_GET_AFC):
-               spin_lock_irqsave(&adapter->driver_lock, flags);
-               memmove(adapter->cur_cmd->pdata_buf, &resp->params.afc,
+               spin_lock_irqsave(&priv->driver_lock, flags);
+               memmove((void *)priv->cur_cmd->callback_arg, &resp->params.afc,
                        sizeof(struct cmd_ds_802_11_afc));
-               spin_unlock_irqrestore(&adapter->driver_lock, flags);
+               spin_unlock_irqrestore(&priv->driver_lock, flags);
 
                break;
 
        case CMD_RET(CMD_MAC_MULTICAST_ADR):
-       case CMD_RET(CMD_MAC_CONTROL):
-       case CMD_RET(CMD_802_11_SET_WEP):
        case CMD_RET(CMD_802_11_RESET):
        case CMD_RET(CMD_802_11_AUTHENTICATE):
-       case CMD_RET(CMD_802_11_RADIO_CONTROL):
        case CMD_RET(CMD_802_11_BEACON_STOP):
                break;
 
-       case CMD_RET(CMD_802_11_ENABLE_RSN):
-               ret = lbs_ret_802_11_enable_rsn(priv, resp);
-               break;
-
-       case CMD_RET(CMD_802_11_DATA_RATE):
-               ret = lbs_ret_802_11_data_rate(priv, resp);
-               break;
        case CMD_RET(CMD_802_11_RATE_ADAPT_RATESET):
                ret = lbs_ret_802_11_rate_adapt_rateset(priv, resp);
                break;
-       case CMD_RET(CMD_802_11_RF_CHANNEL):
-               ret = lbs_ret_802_11_rf_channel(priv, resp);
-               break;
 
        case CMD_RET(CMD_802_11_RSSI):
                ret = lbs_ret_802_11_rssi(priv, resp);
                break;
 
-       case CMD_RET(CMD_802_11_MAC_ADDRESS):
-               ret = lbs_ret_802_11_mac_address(priv, resp);
-               break;
-
        case CMD_RET(CMD_802_11_AD_HOC_STOP):
-               ret = lbs_ret_80211_ad_hoc_stop(priv, resp);
-               break;
-
-       case CMD_RET(CMD_802_11_KEY_MATERIAL):
-               ret = lbs_ret_802_11_key_material(priv, resp);
-               break;
-
-       case CMD_RET(CMD_802_11_EEPROM_ACCESS):
-               ret = lbs_ret_802_11_eeprom_access(priv, resp);
+               ret = lbs_ret_80211_ad_hoc_stop(priv);
                break;
 
        case CMD_RET(CMD_802_11D_DOMAIN_INFO):
-               ret = lbs_ret_802_11d_domain_info(priv, resp);
-               break;
-
-       case CMD_RET(CMD_802_11_SLEEP_PARAMS):
-               ret = lbs_ret_802_11_sleep_params(priv, resp);
-               break;
-       case CMD_RET(CMD_802_11_INACTIVITY_TIMEOUT):
-               spin_lock_irqsave(&adapter->driver_lock, flags);
-               *((u16 *) adapter->cur_cmd->pdata_buf) =
-                   le16_to_cpu(resp->params.inactivity_timeout.timeout);
-               spin_unlock_irqrestore(&adapter->driver_lock, flags);
+               ret = lbs_ret_802_11d_domain_info(resp);
                break;
 
        case CMD_RET(CMD_802_11_TPC_CFG):
-               spin_lock_irqsave(&adapter->driver_lock, flags);
-               memmove(adapter->cur_cmd->pdata_buf, &resp->params.tpccfg,
+               spin_lock_irqsave(&priv->driver_lock, flags);
+               memmove((void *)priv->cur_cmd->callback_arg, &resp->params.tpccfg,
                        sizeof(struct cmd_ds_802_11_tpc_cfg));
-               spin_unlock_irqrestore(&adapter->driver_lock, flags);
+               spin_unlock_irqrestore(&priv->driver_lock, flags);
                break;
        case CMD_RET(CMD_802_11_LED_GPIO_CTRL):
-               spin_lock_irqsave(&adapter->driver_lock, flags);
-               memmove(adapter->cur_cmd->pdata_buf, &resp->params.ledgpio,
+               spin_lock_irqsave(&priv->driver_lock, flags);
+               memmove((void *)priv->cur_cmd->callback_arg, &resp->params.ledgpio,
                        sizeof(struct cmd_ds_802_11_led_ctrl));
-               spin_unlock_irqrestore(&adapter->driver_lock, flags);
-               break;
-       case CMD_RET(CMD_802_11_SUBSCRIBE_EVENT):
-               ret = lbs_ret_802_11_subscribe_event(priv, resp);
-               break;
-
-       case CMD_RET(CMD_802_11_PWR_CFG):
-               spin_lock_irqsave(&adapter->driver_lock, flags);
-               memmove(adapter->cur_cmd->pdata_buf, &resp->params.pwrcfg,
-                       sizeof(struct cmd_ds_802_11_pwr_cfg));
-               spin_unlock_irqrestore(&adapter->driver_lock, flags);
-
+               spin_unlock_irqrestore(&priv->driver_lock, flags);
                break;
 
        case CMD_RET(CMD_GET_TSF):
-               spin_lock_irqsave(&adapter->driver_lock, flags);
-               memcpy(priv->adapter->cur_cmd->pdata_buf,
+               spin_lock_irqsave(&priv->driver_lock, flags);
+               memcpy((void *)priv->cur_cmd->callback_arg,
                       &resp->params.gettsf.tsfvalue, sizeof(u64));
-               spin_unlock_irqrestore(&adapter->driver_lock, flags);
+               spin_unlock_irqrestore(&priv->driver_lock, flags);
                break;
        case CMD_RET(CMD_BT_ACCESS):
-               spin_lock_irqsave(&adapter->driver_lock, flags);
-               if (adapter->cur_cmd->pdata_buf)
-                       memcpy(adapter->cur_cmd->pdata_buf,
+               spin_lock_irqsave(&priv->driver_lock, flags);
+               if (priv->cur_cmd->callback_arg)
+                       memcpy((void *)priv->cur_cmd->callback_arg,
                               &resp->params.bt.addr1, 2 * ETH_ALEN);
-               spin_unlock_irqrestore(&adapter->driver_lock, flags);
+               spin_unlock_irqrestore(&priv->driver_lock, flags);
                break;
        case CMD_RET(CMD_FWT_ACCESS):
-               spin_lock_irqsave(&adapter->driver_lock, flags);
-               if (adapter->cur_cmd->pdata_buf)
-                       memcpy(adapter->cur_cmd->pdata_buf, &resp->params.fwt,
+               spin_lock_irqsave(&priv->driver_lock, flags);
+               if (priv->cur_cmd->callback_arg)
+                       memcpy((void *)priv->cur_cmd->callback_arg, &resp->params.fwt,
                               sizeof(resp->params.fwt));
-               spin_unlock_irqrestore(&adapter->driver_lock, flags);
-               break;
-       case CMD_RET(CMD_MESH_ACCESS):
-               if (adapter->cur_cmd->pdata_buf)
-                       memcpy(adapter->cur_cmd->pdata_buf, &resp->params.mesh,
-                              sizeof(resp->params.mesh));
+               spin_unlock_irqrestore(&priv->driver_lock, flags);
                break;
        case CMD_RET(CMD_802_11_BEACON_CTRL):
                ret = lbs_ret_802_11_bcn_ctrl(priv, resp);
@@ -747,7 +377,7 @@ static inline int handle_cmd_response(u16 respcmd,
 
        default:
                lbs_deb_host("CMD_RESP: unknown cmd response 0x%04x\n",
-                           resp->command);
+                            le16_to_cpu(resp->command));
                break;
        }
        lbs_deb_leave(LBS_DEB_HOST);
@@ -756,53 +386,72 @@ static inline int handle_cmd_response(u16 respcmd,
 
 int lbs_process_rx_command(struct lbs_private *priv)
 {
-       u16 respcmd;
-       struct cmd_ds_command *resp;
-       struct lbs_adapter *adapter = priv->adapter;
+       uint16_t respcmd, curcmd;
+       struct cmd_header *resp;
        int ret = 0;
-       ulong flags;
-       u16 result;
+       unsigned long flags;
+       uint16_t result;
 
        lbs_deb_enter(LBS_DEB_HOST);
 
-       /* Now we got response from FW, cancel the command timer */
-       del_timer(&adapter->command_timer);
-
-       mutex_lock(&adapter->lock);
-       spin_lock_irqsave(&adapter->driver_lock, flags);
+       mutex_lock(&priv->lock);
+       spin_lock_irqsave(&priv->driver_lock, flags);
 
-       if (!adapter->cur_cmd) {
+       if (!priv->cur_cmd) {
                lbs_deb_host("CMD_RESP: cur_cmd is NULL\n");
                ret = -1;
-               spin_unlock_irqrestore(&adapter->driver_lock, flags);
+               spin_unlock_irqrestore(&priv->driver_lock, flags);
                goto done;
        }
-       resp = (struct cmd_ds_command *)(adapter->cur_cmd->bufvirtualaddr);
 
+       resp = (void *)priv->upld_buf;
+       curcmd = le16_to_cpu(priv->cur_cmd->cmdbuf->command);
        respcmd = le16_to_cpu(resp->command);
        result = le16_to_cpu(resp->result);
 
-       lbs_deb_host("CMD_RESP: response 0x%04x, size %d, jiffies %lu\n",
-               respcmd, priv->upld_len, jiffies);
-       lbs_deb_hex(LBS_DEB_HOST, "CMD_RESP", adapter->cur_cmd->bufvirtualaddr,
-                   priv->upld_len);
-
-       if (!(respcmd & 0x8000)) {
-               lbs_deb_host("invalid response!\n");
-               adapter->cur_cmd_retcode = -1;
-               __lbs_cleanup_and_insert_cmd(priv, adapter->cur_cmd);
-               adapter->nr_cmd_pending--;
-               adapter->cur_cmd = NULL;
-               spin_unlock_irqrestore(&adapter->driver_lock, flags);
+       lbs_deb_cmd("CMD_RESP: response 0x%04x, seq %d, size %d\n",
+                    respcmd, le16_to_cpu(resp->seqnum), priv->upld_len);
+       lbs_deb_hex(LBS_DEB_CMD, "CMD_RESP", (void *) resp, priv->upld_len);
+
+       if (resp->seqnum != priv->cur_cmd->cmdbuf->seqnum) {
+               lbs_pr_info("Received CMD_RESP with invalid sequence %d (expected %d)\n",
+                           le16_to_cpu(resp->seqnum), le16_to_cpu(priv->cur_cmd->cmdbuf->seqnum));
+               spin_unlock_irqrestore(&priv->driver_lock, flags);
+               ret = -1;
+               goto done;
+       }
+       if (respcmd != CMD_RET(curcmd) &&
+           respcmd != CMD_RET_802_11_ASSOCIATE && curcmd != CMD_802_11_ASSOCIATE) {
+               lbs_pr_info("Invalid CMD_RESP %x to command %x!\n", respcmd, curcmd);
+               spin_unlock_irqrestore(&priv->driver_lock, flags);
+               ret = -1;
+               goto done;
+       }
+
+       if (resp->result == cpu_to_le16(0x0004)) {
+               /* 0x0004 means -EAGAIN. Drop the response, let it time out
+                  and be resubmitted */
+               lbs_pr_info("Firmware returns DEFER to command %x. Will let it time out...\n",
+                           le16_to_cpu(resp->command));
+               spin_unlock_irqrestore(&priv->driver_lock, flags);
                ret = -1;
                goto done;
        }
 
+       /* Now we got response from FW, cancel the command timer */
+       del_timer(&priv->command_timer);
+       priv->cmd_timed_out = 0;
+       if (priv->nr_retries) {
+               lbs_pr_info("Received result %x to command %x after %d retries\n",
+                           result, curcmd, priv->nr_retries);
+               priv->nr_retries = 0;
+       }
+
        /* Store the response code to cur_cmd_retcode. */
-       adapter->cur_cmd_retcode = result;
+       priv->cur_cmd_retcode = result;
 
        if (respcmd == CMD_RET(CMD_802_11_PS_MODE)) {
-               struct cmd_ds_802_11_ps_mode *psmode = &resp->params.psmode;
+               struct cmd_ds_802_11_ps_mode *psmode = (void *) &resp[1];
                u16 action = le16_to_cpu(psmode->action);
 
                lbs_deb_host(
@@ -817,15 +466,15 @@ int lbs_process_rx_command(struct lbs_private *priv)
                         * ad-hoc mode. It takes place in
                         * lbs_execute_next_command().
                         */
-                       if (adapter->mode == IW_MODE_ADHOC &&
+                       if (priv->mode == IW_MODE_ADHOC &&
                            action == CMD_SUBCMD_ENTER_PS)
-                               adapter->psmode = LBS802_11POWERMODECAM;
+                               priv->psmode = LBS802_11POWERMODECAM;
                } else if (action == CMD_SUBCMD_ENTER_PS) {
-                       adapter->needtowakeup = 0;
-                       adapter->psstate = PS_STATE_AWAKE;
+                       priv->needtowakeup = 0;
+                       priv->psstate = PS_STATE_AWAKE;
 
                        lbs_deb_host("CMD_RESP: ENTER_PS command response\n");
-                       if (adapter->connect_status != LBS_CONNECTED) {
+                       if (priv->connect_status != LBS_CONNECTED) {
                                /*
                                 * When Deauth Event received before Enter_PS command
                                 * response, We need to wake up the firmware.
@@ -833,24 +482,22 @@ int lbs_process_rx_command(struct lbs_private *priv)
                                lbs_deb_host(
                                       "disconnected, invoking lbs_ps_wakeup\n");
 
-                               spin_unlock_irqrestore(&adapter->driver_lock, flags);
-                               mutex_unlock(&adapter->lock);
+                               spin_unlock_irqrestore(&priv->driver_lock, flags);
+                               mutex_unlock(&priv->lock);
                                lbs_ps_wakeup(priv, 0);
-                               mutex_lock(&adapter->lock);
-                               spin_lock_irqsave(&adapter->driver_lock, flags);
+                               mutex_lock(&priv->lock);
+                               spin_lock_irqsave(&priv->driver_lock, flags);
                        }
                } else if (action == CMD_SUBCMD_EXIT_PS) {
-                       adapter->needtowakeup = 0;
-                       adapter->psstate = PS_STATE_FULL_POWER;
+                       priv->needtowakeup = 0;
+                       priv->psstate = PS_STATE_FULL_POWER;
                        lbs_deb_host("CMD_RESP: EXIT_PS command response\n");
                } else {
                        lbs_deb_host("CMD_RESP: PS action 0x%X\n", action);
                }
 
-               __lbs_cleanup_and_insert_cmd(priv, adapter->cur_cmd);
-               adapter->nr_cmd_pending--;
-               adapter->cur_cmd = NULL;
-               spin_unlock_irqrestore(&adapter->driver_lock, flags);
+               lbs_complete_command(priv, priv->cur_cmd, result);
+               spin_unlock_irqrestore(&priv->driver_lock, flags);
 
                ret = 0;
                goto done;
@@ -870,36 +517,54 @@ int lbs_process_rx_command(struct lbs_private *priv)
                        break;
 
                }
-
-               __lbs_cleanup_and_insert_cmd(priv, adapter->cur_cmd);
-               adapter->nr_cmd_pending--;
-               adapter->cur_cmd = NULL;
-               spin_unlock_irqrestore(&adapter->driver_lock, flags);
+               lbs_complete_command(priv, priv->cur_cmd, result);
+               spin_unlock_irqrestore(&priv->driver_lock, flags);
 
                ret = -1;
                goto done;
        }
 
-       spin_unlock_irqrestore(&adapter->driver_lock, flags);
+       spin_unlock_irqrestore(&priv->driver_lock, flags);
 
-       if (adapter->cur_cmd && adapter->cur_cmd->callback)
-               ret = adapter->cur_cmd->callback(respcmd, resp, priv);
-       else
-               ret = handle_cmd_response(respcmd, resp, priv);
+       if (priv->cur_cmd && priv->cur_cmd->callback) {
+               ret = priv->cur_cmd->callback(priv, priv->cur_cmd->callback_arg,
+                               resp);
+       } else
+               ret = handle_cmd_response(priv, resp);
 
-       spin_lock_irqsave(&adapter->driver_lock, flags);
+       spin_lock_irqsave(&priv->driver_lock, flags);
 
-       if (adapter->cur_cmd) {
+       if (priv->cur_cmd) {
                /* Clean up and Put current command back to cmdfreeq */
-               __lbs_cleanup_and_insert_cmd(priv, adapter->cur_cmd);
-               adapter->nr_cmd_pending--;
-               WARN_ON(adapter->nr_cmd_pending > 128);
-               adapter->cur_cmd = NULL;
+               lbs_complete_command(priv, priv->cur_cmd, result);
        }
-       spin_unlock_irqrestore(&adapter->driver_lock, flags);
+       spin_unlock_irqrestore(&priv->driver_lock, flags);
 
 done:
-       mutex_unlock(&adapter->lock);
+       mutex_unlock(&priv->lock);
+       lbs_deb_leave_args(LBS_DEB_HOST, "ret %d", ret);
+       return ret;
+}
+
+static int lbs_send_confirmwake(struct lbs_private *priv)
+{
+       struct cmd_header cmd;
+       int ret = 0;
+
+       lbs_deb_enter(LBS_DEB_HOST);
+
+       cmd.command = cpu_to_le16(CMD_802_11_WAKEUP_CONFIRM);
+       cmd.size = cpu_to_le16(sizeof(cmd));
+       cmd.seqnum = cpu_to_le16(++priv->seqnum);
+       cmd.result = 0;
+
+       lbs_deb_hex(LBS_DEB_HOST, "wake confirm", (u8 *) &cmd,
+               sizeof(cmd));
+
+       ret = priv->hw_host_to_card(priv, MVMS_CMD, (u8 *) &cmd, sizeof(cmd));
+       if (ret)
+               lbs_pr_alert("SEND_WAKEC_CMD: Host to Card failed for Confirm Wake\n");
+
        lbs_deb_leave_args(LBS_DEB_HOST, "ret %d", ret);
        return ret;
 }
@@ -907,20 +572,17 @@ done:
 int lbs_process_event(struct lbs_private *priv)
 {
        int ret = 0;
-       struct lbs_adapter *adapter = priv->adapter;
        u32 eventcause;
 
        lbs_deb_enter(LBS_DEB_CMD);
 
-       spin_lock_irq(&adapter->driver_lock);
-       eventcause = adapter->eventcause >> SBI_EVENT_CAUSE_SHIFT;
-       spin_unlock_irq(&adapter->driver_lock);
-
-       lbs_deb_cmd("event cause %d\n", eventcause);
+       spin_lock_irq(&priv->driver_lock);
+       eventcause = priv->eventcause >> SBI_EVENT_CAUSE_SHIFT;
+       spin_unlock_irq(&priv->driver_lock);
 
        switch (eventcause) {
        case MACREG_INT_CODE_LINK_SENSED:
-               lbs_deb_cmd("EVENT: MACREG_INT_CODE_LINK_SENSED\n");
+               lbs_deb_cmd("EVENT: link sensed\n");
                break;
 
        case MACREG_INT_CODE_DEAUTHENTICATED:
@@ -939,37 +601,41 @@ int lbs_process_event(struct lbs_private *priv)
                break;
 
        case MACREG_INT_CODE_PS_SLEEP:
-               lbs_deb_cmd("EVENT: sleep\n");
+               lbs_deb_cmd("EVENT: ps sleep\n");
 
                /* handle unexpected PS SLEEP event */
-               if (adapter->psstate == PS_STATE_FULL_POWER) {
+               if (priv->psstate == PS_STATE_FULL_POWER) {
                        lbs_deb_cmd(
                               "EVENT: in FULL POWER mode, ignoreing PS_SLEEP\n");
                        break;
                }
-               adapter->psstate = PS_STATE_PRE_SLEEP;
+               priv->psstate = PS_STATE_PRE_SLEEP;
 
-               lbs_ps_confirm_sleep(priv, (u16) adapter->psmode);
+               lbs_ps_confirm_sleep(priv);
 
                break;
 
-       case MACREG_INT_CODE_PS_AWAKE:
-               lbs_deb_cmd("EVENT: awake\n");
+       case MACREG_INT_CODE_HOST_AWAKE:
+               lbs_deb_cmd("EVENT: host awake\n");
+               lbs_send_confirmwake(priv);
+               break;
 
+       case MACREG_INT_CODE_PS_AWAKE:
+               lbs_deb_cmd("EVENT: ps awake\n");
                /* handle unexpected PS AWAKE event */
-               if (adapter->psstate == PS_STATE_FULL_POWER) {
+               if (priv->psstate == PS_STATE_FULL_POWER) {
                        lbs_deb_cmd(
                               "EVENT: In FULL POWER mode - ignore PS AWAKE\n");
                        break;
                }
 
-               adapter->psstate = PS_STATE_AWAKE;
+               priv->psstate = PS_STATE_AWAKE;
 
-               if (adapter->needtowakeup) {
+               if (priv->needtowakeup) {
                        /*
                         * wait for the command processing to finish
                         * before resuming sending
-                        * adapter->needtowakeup will be set to FALSE
+                        * priv->needtowakeup will be set to FALSE
                         * in lbs_ps_wakeup()
                         */
                        lbs_deb_cmd("waking up ...\n");
@@ -986,14 +652,16 @@ int lbs_process_event(struct lbs_private *priv)
                lbs_deb_cmd("EVENT: MULTICAST MIC ERROR\n");
                handle_mic_failureevent(priv, MACREG_INT_CODE_MIC_ERR_MULTICAST);
                break;
+
        case MACREG_INT_CODE_MIB_CHANGED:
+               lbs_deb_cmd("EVENT: MIB CHANGED\n");
+               break;
        case MACREG_INT_CODE_INIT_DONE:
+               lbs_deb_cmd("EVENT: INIT DONE\n");
                break;
-
        case MACREG_INT_CODE_ADHOC_BCN_LOST:
                lbs_deb_cmd("EVENT: ADHOC beacon lost\n");
                break;
-
        case MACREG_INT_CODE_RSSI_LOW:
                lbs_pr_alert("EVENT: rssi low\n");
                break;
@@ -1017,12 +685,13 @@ int lbs_process_event(struct lbs_private *priv)
                        break;
                }
                lbs_pr_info("EVENT: MESH_AUTO_STARTED\n");
-               adapter->mesh_connect_status = LBS_CONNECTED;
-               if (priv->mesh_open == 1) {
-                       netif_wake_queue(priv->mesh_dev);
+               priv->mesh_connect_status = LBS_CONNECTED;
+               if (priv->mesh_open) {
                        netif_carrier_on(priv->mesh_dev);
+                       if (!priv->tx_pending_len)
+                               netif_wake_queue(priv->mesh_dev);
                }
-               adapter->mode = IW_MODE_ADHOC;
+               priv->mode = IW_MODE_ADHOC;
                schedule_work(&priv->sync_channel);
                break;
 
@@ -1031,9 +700,9 @@ int lbs_process_event(struct lbs_private *priv)
                break;
        }
 
-       spin_lock_irq(&adapter->driver_lock);
-       adapter->eventcause = 0;
-       spin_unlock_irq(&adapter->driver_lock);
+       spin_lock_irq(&priv->driver_lock);
+       priv->eventcause = 0;
+       spin_unlock_irq(&priv->driver_lock);
 
        lbs_deb_leave_args(LBS_DEB_CMD, "ret %d", ret);
        return ret;