cleanup MTD option handling

[openwrt.git] / package / libertas / src / cmdresp.c

diff --git a/package/libertas/src/cmdresp.c b/package/libertas/src/cmdresp.c
index bf9941e..5abecb7 100644 (file)
--- a/package/libertas/src/cmdresp.c
+++ b/package/libertas/src/cmdresp.c
@@ -12,7 +12,7 @@
 #include "decl.h"
 #include "defs.h"
 #include "dev.h"
 #include "decl.h"
 #include "defs.h"
 #include "dev.h"

-#include "join.h"
+#include "assoc.h"

 #include "wext.h"
 
 /**
 #include "wext.h"
 
 /**


@@ -43,14 +43,15 @@ void lbs_mac_event_disconnected(struct lbs_private *priv)
        msleep_interruptible(1000);
        wireless_send_event(priv->dev, SIOCGIWAP, &wrqu, NULL);
 
        msleep_interruptible(1000);
        wireless_send_event(priv->dev, SIOCGIWAP, &wrqu, NULL);
 

-       /* Free Tx and Rx packets */
-       kfree_skb(priv->currenttxskb);
-       priv->currenttxskb = NULL;
-

        /* report disconnect to upper layer */
        netif_stop_queue(priv->dev);
        netif_carrier_off(priv->dev);
 
        /* 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(priv->SNR, 0x00, sizeof(priv->SNR));
        memset(priv->NF, 0x00, sizeof(priv->NF));
        /* reset SNR/NF/RSSI values */
        memset(priv->SNR, 0x00, sizeof(priv->SNR));
        memset(priv->NF, 0x00, sizeof(priv->NF));


@@ -73,7 +74,7 @@ void lbs_mac_event_disconnected(struct lbs_private *priv)
                lbs_deb_cmd("disconnected, so exit PS mode\n");
                lbs_ps_wakeup(priv, 0);
        }
                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);

 }
 
 /**
 }
 
 /**


@@ -145,45 +146,6 @@ static int lbs_ret_reg_access(struct lbs_private *priv,
        return 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;
-
-       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);
-
-       priv->sp.sp_error = le16_to_cpu(sp->error);
-       priv->sp.sp_offset = le16_to_cpu(sp->offset);
-       priv->sp.sp_stabletime = le16_to_cpu(sp->stabletime);
-       priv->sp.sp_calcontrol = sp->calcontrol;
-       priv->sp.sp_extsleepclk = sp->externalsleepclk;
-       priv->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 priv->wlan802_11Stat is unused
-
-       struct cmd_ds_802_11_get_stat *p11Stat = &resp->params.gstat;
-
-       // TODO Convert it to Big endian befor copy
-       memcpy(&priv->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)
 {
 static int lbs_ret_802_11_snmp_mib(struct lbs_private *priv,
                                    struct cmd_ds_command *resp)
 {


@@ -226,74 +188,6 @@ static int lbs_ret_802_11_snmp_mib(struct lbs_private *priv,
        return 0;
 }
 
        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;
-       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 = &priv->wpa_unicast_key;
-                       else if (key_flags & KEY_INFO_WPA_MCAST)
-                               pkey = &priv->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;
-
-       lbs_deb_enter(LBS_DEB_CMD);
-
-       memcpy(priv->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)
 {
 static int lbs_ret_802_11_rf_tx_power(struct lbs_private *priv,
                                       struct cmd_ds_command *resp)
 {


@@ -355,62 +249,6 @@ static int lbs_ret_802_11_rssi(struct lbs_private *priv,
        return 0;
 }
 
        return 0;
 }
 

-static int lbs_ret_802_11_eeprom_access(struct lbs_private *priv,
-                                 struct cmd_ds_command *resp)
-{
-       struct lbs_ioctl_regrdwr *pbuf;
-       pbuf = (struct lbs_ioctl_regrdwr *) priv->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;
-
-       lbs_deb_enter(LBS_DEB_CMD);
-
-       /* Stored little-endian */
-       memcpy(&priv->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;
-       u32 * pdata_buf = priv->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);
-       }
-
-       lbs_deb_leave(LBS_DEB_CMD);
-       return 0;
-}
-

 static int lbs_ret_802_11_bcn_ctrl(struct lbs_private * priv,
                                        struct cmd_ds_command *resp)
 {
 static int lbs_ret_802_11_bcn_ctrl(struct lbs_private * priv,
                                        struct cmd_ds_command *resp)
 {


@@ -428,27 +266,7 @@ static int lbs_ret_802_11_bcn_ctrl(struct lbs_private * priv,
        return 0;
 }
 
        return 0;
 }
 

-static int lbs_ret_802_11_subscribe_event(struct lbs_private *priv,
-       struct cmd_ds_command *resp)
-{
-       struct cmd_ds_802_11_subscribe_event *cmd_event =
-               &resp->params.subscribe_event;
-       struct cmd_ds_802_11_subscribe_event *dst_event =
-               priv->cur_cmd->pdata_buf;
-
-       lbs_deb_enter(LBS_DEB_CMD);
-
-       if (dst_event->action == cpu_to_le16(CMD_ACT_GET)) {
-               dst_event->events = 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(struct lbs_private *priv,
 static inline int handle_cmd_response(struct lbs_private *priv,

-                                     unsigned long dummy,

                                      struct cmd_header *cmd_response)
 {
        struct cmd_ds_command *resp = (struct cmd_ds_command *) cmd_response;
                                      struct cmd_header *cmd_response)
 {
        struct cmd_ds_command *resp = (struct cmd_ds_command *) cmd_response;


@@ -465,14 +283,6 @@ static inline int handle_cmd_response(struct lbs_private *priv,
                ret = lbs_ret_reg_access(priv, respcmd, resp);
                break;
 
                ret = lbs_ret_reg_access(priv, respcmd, 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):
        case CMD_RET_802_11_ASSOCIATE:
        case CMD_RET(CMD_802_11_ASSOCIATE):
        case CMD_RET(CMD_802_11_REASSOCIATE):


@@ -481,7 +291,7 @@ static inline int handle_cmd_response(struct lbs_private *priv,
 
        case CMD_RET(CMD_802_11_DISASSOCIATE):
        case CMD_RET(CMD_802_11_DEAUTHENTICATE):
 
        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):
                break;
 
        case CMD_RET(CMD_802_11_AD_HOC_START):


@@ -489,10 +299,6 @@ static inline int handle_cmd_response(struct lbs_private *priv,
                ret = lbs_ret_80211_ad_hoc_start(priv, resp);
                break;
 
                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;
        case CMD_RET(CMD_802_11_SNMP_MIB):
                ret = lbs_ret_802_11_snmp_mib(priv, resp);
                break;


@@ -504,25 +310,18 @@ static inline int handle_cmd_response(struct lbs_private *priv,
        case CMD_RET(CMD_802_11_SET_AFC):
        case CMD_RET(CMD_802_11_GET_AFC):
                spin_lock_irqsave(&priv->driver_lock, flags);
        case CMD_RET(CMD_802_11_SET_AFC):
        case CMD_RET(CMD_802_11_GET_AFC):
                spin_lock_irqsave(&priv->driver_lock, flags);

-               memmove(priv->cur_cmd->pdata_buf, &resp->params.afc,
+               memmove((void *)priv->cur_cmd->callback_arg, &resp->params.afc,

                        sizeof(struct cmd_ds_802_11_afc));
                spin_unlock_irqrestore(&priv->driver_lock, flags);
 
                break;
 
        case CMD_RET(CMD_MAC_MULTICAST_ADR):
                        sizeof(struct cmd_ds_802_11_afc));
                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_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_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_RATE_ADAPT_RATESET):
                ret = lbs_ret_802_11_rate_adapt_rateset(priv, resp);
                break;
        case CMD_RET(CMD_802_11_RATE_ADAPT_RATESET):
                ret = lbs_ret_802_11_rate_adapt_rateset(priv, resp);
                break;


@@ -531,77 +330,44 @@ static inline int handle_cmd_response(struct lbs_private *priv,
                ret = lbs_ret_802_11_rssi(priv, resp);
                break;
 
                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):
        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):
                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(&priv->driver_lock, flags);
-               *((u16 *) priv->cur_cmd->pdata_buf) =
-                   le16_to_cpu(resp->params.inactivity_timeout.timeout);
-               spin_unlock_irqrestore(&priv->driver_lock, flags);
+               ret = lbs_ret_802_11d_domain_info(resp);

                break;
 
        case CMD_RET(CMD_802_11_TPC_CFG):
                spin_lock_irqsave(&priv->driver_lock, flags);
                break;
 
        case CMD_RET(CMD_802_11_TPC_CFG):
                spin_lock_irqsave(&priv->driver_lock, flags);

-               memmove(priv->cur_cmd->pdata_buf, &resp->params.tpccfg,
+               memmove((void *)priv->cur_cmd->callback_arg, &resp->params.tpccfg,

                        sizeof(struct cmd_ds_802_11_tpc_cfg));
                spin_unlock_irqrestore(&priv->driver_lock, flags);
                break;
        case CMD_RET(CMD_802_11_LED_GPIO_CTRL):
                spin_lock_irqsave(&priv->driver_lock, flags);
                        sizeof(struct cmd_ds_802_11_tpc_cfg));
                spin_unlock_irqrestore(&priv->driver_lock, flags);
                break;
        case CMD_RET(CMD_802_11_LED_GPIO_CTRL):
                spin_lock_irqsave(&priv->driver_lock, flags);

-               memmove(priv->cur_cmd->pdata_buf, &resp->params.ledgpio,
+               memmove((void *)priv->cur_cmd->callback_arg, &resp->params.ledgpio,

                        sizeof(struct cmd_ds_802_11_led_ctrl));
                spin_unlock_irqrestore(&priv->driver_lock, flags);
                break;
                        sizeof(struct cmd_ds_802_11_led_ctrl));
                spin_unlock_irqrestore(&priv->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(&priv->driver_lock, flags);
-               memmove(priv->cur_cmd->pdata_buf, &resp->params.pwrcfg,
-                       sizeof(struct cmd_ds_802_11_pwr_cfg));
-               spin_unlock_irqrestore(&priv->driver_lock, flags);
-
-               break;

 
        case CMD_RET(CMD_GET_TSF):
                spin_lock_irqsave(&priv->driver_lock, flags);
 
        case CMD_RET(CMD_GET_TSF):
                spin_lock_irqsave(&priv->driver_lock, flags);

-               memcpy(priv->cur_cmd->pdata_buf,
+               memcpy((void *)priv->cur_cmd->callback_arg,

                       &resp->params.gettsf.tsfvalue, sizeof(u64));
                spin_unlock_irqrestore(&priv->driver_lock, flags);
                break;
        case CMD_RET(CMD_BT_ACCESS):
                spin_lock_irqsave(&priv->driver_lock, flags);
                       &resp->params.gettsf.tsfvalue, sizeof(u64));
                spin_unlock_irqrestore(&priv->driver_lock, flags);
                break;
        case CMD_RET(CMD_BT_ACCESS):
                spin_lock_irqsave(&priv->driver_lock, flags);

-               if (priv->cur_cmd->pdata_buf)
-                       memcpy(priv->cur_cmd->pdata_buf,
+               if (priv->cur_cmd->callback_arg)
+                       memcpy((void *)priv->cur_cmd->callback_arg,

                               &resp->params.bt.addr1, 2 * ETH_ALEN);
                spin_unlock_irqrestore(&priv->driver_lock, flags);
                break;
        case CMD_RET(CMD_FWT_ACCESS):
                spin_lock_irqsave(&priv->driver_lock, flags);
                               &resp->params.bt.addr1, 2 * ETH_ALEN);
                spin_unlock_irqrestore(&priv->driver_lock, flags);
                break;
        case CMD_RET(CMD_FWT_ACCESS):
                spin_lock_irqsave(&priv->driver_lock, flags);

-               if (priv->cur_cmd->pdata_buf)
-                       memcpy(priv->cur_cmd->pdata_buf, &resp->params.fwt,
+               if (priv->cur_cmd->callback_arg)
+                       memcpy((void *)priv->cur_cmd->callback_arg, &resp->params.fwt,

                               sizeof(resp->params.fwt));
                spin_unlock_irqrestore(&priv->driver_lock, flags);
                break;
                               sizeof(resp->params.fwt));
                spin_unlock_irqrestore(&priv->driver_lock, flags);
                break;


@@ -611,26 +377,23 @@ static inline int handle_cmd_response(struct lbs_private *priv,
 
        default:
                lbs_deb_host("CMD_RESP: unknown cmd response 0x%04x\n",
 
        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);
        return ret;
 }
 
                break;
        }
        lbs_deb_leave(LBS_DEB_HOST);
        return ret;
 }
 

-int lbs_process_rx_command(struct lbs_private *priv)
+int lbs_process_command_response(struct lbs_private *priv, u8 *data, u32 len)

 {
 {

-       u16 respcmd;
+       uint16_t respcmd, curcmd;

        struct cmd_header *resp;
        int ret = 0;
        struct cmd_header *resp;
        int ret = 0;

-       ulong flags;
-       u16 result;
+       unsigned long flags;
+       uint16_t result;

 
        lbs_deb_enter(LBS_DEB_HOST);
 
 
        lbs_deb_enter(LBS_DEB_HOST);
 

-       /* Now we got response from FW, cancel the command timer */
-       del_timer(&priv->command_timer);
-

        mutex_lock(&priv->lock);
        spin_lock_irqsave(&priv->driver_lock, flags);
 
        mutex_lock(&priv->lock);
        spin_lock_irqsave(&priv->driver_lock, flags);
 


@@ -640,30 +403,55 @@ int lbs_process_rx_command(struct lbs_private *priv)
                spin_unlock_irqrestore(&priv->driver_lock, flags);
                goto done;
        }
                spin_unlock_irqrestore(&priv->driver_lock, flags);
                goto done;
        }

-       resp = priv->cur_cmd->cmdbuf;

 
 

+       resp = (void *)data;
+       curcmd = le16_to_cpu(priv->cur_cmd->cmdbuf->command);

        respcmd = le16_to_cpu(resp->command);
        result = le16_to_cpu(resp->result);
 
        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", (void *) resp, priv->upld_len);
+       lbs_deb_cmd("CMD_RESP: response 0x%04x, seq %d, size %d\n",
+                    respcmd, le16_to_cpu(resp->seqnum), len);
+       lbs_deb_hex(LBS_DEB_CMD, "CMD_RESP", (void *) resp, len);

 
 

-       if (!(respcmd & 0x8000)) {
-               lbs_deb_host("invalid response!\n");
-               priv->cur_cmd_retcode = -1;
-               __lbs_cleanup_and_insert_cmd(priv, priv->cur_cmd);
-               priv->cur_cmd = NULL;
+       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;
        }
 
                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. */
        priv->cur_cmd_retcode = result;
 
        if (respcmd == CMD_RET(CMD_802_11_PS_MODE)) {
        /* Store the response code to cur_cmd_retcode. */
        priv->cur_cmd_retcode = result;
 
        if (respcmd == CMD_RET(CMD_802_11_PS_MODE)) {

-               struct cmd_ds_802_11_ps_mode *psmode = (void *) resp;
+               struct cmd_ds_802_11_ps_mode *psmode = (void *) &resp[1];

                u16 action = le16_to_cpu(psmode->action);
 
                lbs_deb_host(
                u16 action = le16_to_cpu(psmode->action);
 
                lbs_deb_host(


@@ -708,8 +496,7 @@ int lbs_process_rx_command(struct lbs_private *priv)
                        lbs_deb_host("CMD_RESP: PS action 0x%X\n", action);
                }
 
                        lbs_deb_host("CMD_RESP: PS action 0x%X\n", action);
                }
 

-               __lbs_cleanup_and_insert_cmd(priv, priv->cur_cmd);
-               priv->cur_cmd = NULL;
+               lbs_complete_command(priv, priv->cur_cmd, result);

                spin_unlock_irqrestore(&priv->driver_lock, flags);
 
                ret = 0;
                spin_unlock_irqrestore(&priv->driver_lock, flags);
 
                ret = 0;


@@ -730,9 +517,7 @@ int lbs_process_rx_command(struct lbs_private *priv)
                        break;
 
                }
                        break;
 
                }

-
-               __lbs_cleanup_and_insert_cmd(priv, priv->cur_cmd);
-               priv->cur_cmd = NULL;
+               lbs_complete_command(priv, priv->cur_cmd, result);

                spin_unlock_irqrestore(&priv->driver_lock, flags);
 
                ret = -1;
                spin_unlock_irqrestore(&priv->driver_lock, flags);
 
                ret = -1;


@@ -745,14 +530,13 @@ int lbs_process_rx_command(struct lbs_private *priv)
                ret = priv->cur_cmd->callback(priv, priv->cur_cmd->callback_arg,
                                resp);
        } else
                ret = priv->cur_cmd->callback(priv, priv->cur_cmd->callback_arg,
                                resp);
        } else

-               ret = handle_cmd_response(priv, 0, resp);
+               ret = handle_cmd_response(priv, resp);

 
        spin_lock_irqsave(&priv->driver_lock, flags);
 
        if (priv->cur_cmd) {
                /* Clean up and Put current command back to cmdfreeq */
 
        spin_lock_irqsave(&priv->driver_lock, flags);
 
        if (priv->cur_cmd) {
                /* Clean up and Put current command back to cmdfreeq */

-               __lbs_cleanup_and_insert_cmd(priv, priv->cur_cmd);
-               priv->cur_cmd = NULL;
+               lbs_complete_command(priv, priv->cur_cmd, result);

        }
        spin_unlock_irqrestore(&priv->driver_lock, flags);
 
        }
        spin_unlock_irqrestore(&priv->driver_lock, flags);
 


@@ -762,22 +546,38 @@ done:
        return ret;
 }
 
        return ret;
 }
 

-int lbs_process_event(struct lbs_private *priv)
+static int lbs_send_confirmwake(struct lbs_private *priv)

 {
 {

+       struct cmd_header cmd;

        int ret = 0;
        int ret = 0;

-       u32 eventcause;

 
 

-       lbs_deb_enter(LBS_DEB_CMD);
+       lbs_deb_enter(LBS_DEB_HOST);

 
 

-       spin_lock_irq(&priv->driver_lock);
-       eventcause = priv->eventcause >> SBI_EVENT_CAUSE_SHIFT;
-       spin_unlock_irq(&priv->driver_lock);
+       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_cmd("event cause %d\n", eventcause);
+       lbs_deb_hex(LBS_DEB_HOST, "wake confirm", (u8 *) &cmd,
+               sizeof(cmd));

 
 

-       switch (eventcause) {
+       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;
+}
+
+int lbs_process_event(struct lbs_private *priv, u32 event)
+{
+       int ret = 0;
+
+       lbs_deb_enter(LBS_DEB_CMD);
+
+       switch (event) {

        case MACREG_INT_CODE_LINK_SENSED:
        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:
                break;
 
        case MACREG_INT_CODE_DEAUTHENTICATED:


@@ -796,7 +596,7 @@ int lbs_process_event(struct lbs_private *priv)
                break;
 
        case MACREG_INT_CODE_PS_SLEEP:
                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 (priv->psstate == PS_STATE_FULL_POWER) {
 
                /* handle unexpected PS SLEEP event */
                if (priv->psstate == PS_STATE_FULL_POWER) {


@@ -806,13 +606,17 @@ int lbs_process_event(struct lbs_private *priv)
                }
                priv->psstate = PS_STATE_PRE_SLEEP;
 
                }
                priv->psstate = PS_STATE_PRE_SLEEP;
 

-               lbs_ps_confirm_sleep(priv, (u16) priv->psmode);
+               lbs_ps_confirm_sleep(priv);

 
                break;
 
 
                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 (priv->psstate == PS_STATE_FULL_POWER) {
                        lbs_deb_cmd(
                /* handle unexpected PS AWAKE event */
                if (priv->psstate == PS_STATE_FULL_POWER) {
                        lbs_deb_cmd(


@@ -843,14 +647,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;
                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:
        case MACREG_INT_CODE_MIB_CHANGED:

+               lbs_deb_cmd("EVENT: MIB CHANGED\n");
+               break;

        case MACREG_INT_CODE_INIT_DONE:
        case MACREG_INT_CODE_INIT_DONE:

+               lbs_deb_cmd("EVENT: INIT DONE\n");

                break;
                break;

-

        case MACREG_INT_CODE_ADHOC_BCN_LOST:
                lbs_deb_cmd("EVENT: ADHOC beacon lost\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;
        case MACREG_INT_CODE_RSSI_LOW:
                lbs_pr_alert("EVENT: rssi low\n");
                break;


@@ -875,23 +681,20 @@ int lbs_process_event(struct lbs_private *priv)
                }
                lbs_pr_info("EVENT: MESH_AUTO_STARTED\n");
                priv->mesh_connect_status = LBS_CONNECTED;
                }
                lbs_pr_info("EVENT: MESH_AUTO_STARTED\n");
                priv->mesh_connect_status = LBS_CONNECTED;

-               if (priv->mesh_open == 1) {
-                       netif_wake_queue(priv->mesh_dev);
+               if (priv->mesh_open) {

                        netif_carrier_on(priv->mesh_dev);
                        netif_carrier_on(priv->mesh_dev);

+                       if (!priv->tx_pending_len)
+                               netif_wake_queue(priv->mesh_dev);

                }
                priv->mode = IW_MODE_ADHOC;
                schedule_work(&priv->sync_channel);
                break;
 
        default:
                }
                priv->mode = IW_MODE_ADHOC;
                schedule_work(&priv->sync_channel);
                break;
 
        default:

-               lbs_pr_alert("EVENT: unknown event id %d\n", eventcause);
+               lbs_pr_alert("EVENT: unknown event id %d\n", event);

                break;
        }
 
                break;
        }
 

-       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;
 }
        lbs_deb_leave_args(LBS_DEB_CMD, "ret %d", ret);
        return ret;
 }