]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[PATCH] libertas: first pass at fixing up endianness issues
authorDavid Woodhouse <dwmw2@infradead.org>
Sat, 26 May 2007 03:36:54 +0000 (23:36 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 11 Jun 2007 18:28:45 +0000 (14:28 -0400)
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
21 files changed:
drivers/net/wireless/libertas/11d.c
drivers/net/wireless/libertas/11d.h
drivers/net/wireless/libertas/assoc.c
drivers/net/wireless/libertas/cmd.c
drivers/net/wireless/libertas/cmdresp.c
drivers/net/wireless/libertas/debugfs.c
drivers/net/wireless/libertas/ethtool.c
drivers/net/wireless/libertas/fw.c
drivers/net/wireless/libertas/hostcmd.h
drivers/net/wireless/libertas/if_bootcmd.c
drivers/net/wireless/libertas/if_usb.c
drivers/net/wireless/libertas/if_usb.h
drivers/net/wireless/libertas/ioctl.c
drivers/net/wireless/libertas/join.c
drivers/net/wireless/libertas/main.c
drivers/net/wireless/libertas/rx.c
drivers/net/wireless/libertas/scan.c
drivers/net/wireless/libertas/scan.h
drivers/net/wireless/libertas/tx.c
drivers/net/wireless/libertas/types.h
drivers/net/wireless/libertas/wext.c

index 261bbd55e94fc1016ff781b29819bb60c344b7d8..4cf0ff7b833d6e77d6c99e5ba36c066f1b61b037 100644 (file)
@@ -570,7 +570,7 @@ int libertas_cmd_802_11d_domain_info(wlan_private * priv,
                    cpu_to_le16(sizeof(pdomaininfo->action) + S_DS_GEN);
        }
 
-       lbs_dbg_hex("11D:802_11D_DOMAIN_INFO:", (u8 *) cmd, (int)(cmd->size));
+       lbs_dbg_hex("11D:802_11D_DOMAIN_INFO:", (u8 *) cmd, le16_to_cpu(cmd->size));
 
 done:
        lbs_deb_enter(LBS_DEB_11D);
@@ -611,8 +611,7 @@ int libertas_cmd_enable_11d(wlan_private * priv, struct iwreq *wrq)
 int libertas_ret_802_11d_domain_info(wlan_private * priv,
                                 struct cmd_ds_command *resp)
 {
-       struct cmd_ds_802_11d_domain_info
-       *domaininfo = &resp->params.domaininforesp;
+       struct cmd_ds_802_11d_domain_info *domaininfo = &resp->params.domaininforesp;
        struct mrvlietypes_domainparamset *domain = &domaininfo->domain;
        u16 action = le16_to_cpu(domaininfo->action);
        s16 ret = 0;
@@ -623,8 +622,8 @@ int libertas_ret_802_11d_domain_info(wlan_private * priv,
        lbs_dbg_hex("11D DOMAIN Info Rsp Data:", (u8 *) resp,
                (int)le16_to_cpu(resp->size));
 
-       nr_subband = (domain->header.len - 3) / sizeof(struct ieeetypes_subbandset);
-       /* countrycode 3 bytes */
+       nr_subband = (le16_to_cpu(domain->header.len) - COUNTRY_CODE_LEN) /
+                     sizeof(struct ieeetypes_subbandset);
 
        lbs_deb_11d("11D Domain Info Resp: nr_subband=%d\n", nr_subband);
 
index 982d7929eed7cd1ec129044b09d5503e4aae6026..73e42e7129110a3da2fefc377fbdd8a10676ef0a 100644 (file)
@@ -47,7 +47,7 @@ struct mrvlietypes_domainparamset {
 } __attribute__ ((packed));
 
 struct cmd_ds_802_11d_domain_info {
-       u16 action;
+       __le16 action;
        struct mrvlietypes_domainparamset domain;
 } __attribute__ ((packed));
 
index 2ee38a25adef25354eabf691d52d5923c4ee7095..c70c472f4e0eca015b69cfa27652ddfbfa1df24c 100644 (file)
@@ -209,7 +209,7 @@ static int assoc_helper_mode(wlan_private *priv,
                                    cmd_802_11_snmp_mib,
                                    0, cmd_option_waitforrsp,
                                    OID_802_11_INFRASTRUCTURE_MODE,
-                                   (void *) (size_t) assoc_req->mode);
+               /* Shoot me now */  (void *) (size_t) assoc_req->mode);
 
 done:
        lbs_deb_leave_args(LBS_DEB_ASSOC, "ret %d", ret);
index 8da788e2ecf93c84701c52187fff3ce7158185aa..124e029f1bf412105d0f02e643be55c9cb1ffc71 100644 (file)
@@ -25,13 +25,11 @@ static u16 commands_allowed_in_ps[] = {
  *  @param command the command ID
  *  @return       TRUE or FALSE
  */
-static u8 is_command_allowed_in_ps(u16 command)
+static u8 is_command_allowed_in_ps(__le16 command)
 {
-       int count = sizeof(commands_allowed_in_ps)
-           / sizeof(commands_allowed_in_ps[0]);
        int i;
 
-       for (i = 0; i < count; i++) {
+       for (i = 0; i < ARRAY_SIZE(commands_allowed_in_ps); i++) {
                if (command == cpu_to_le16(commands_allowed_in_ps[i]))
                        return 1;
        }
@@ -46,8 +44,7 @@ static int wlan_cmd_hw_spec(wlan_private * priv, struct cmd_ds_command *cmd)
        lbs_deb_enter(LBS_DEB_CMD);
 
        cmd->command = cpu_to_le16(cmd_get_hw_spec);
-       cmd->size =
-           cpu_to_le16(sizeof(struct cmd_ds_get_hw_spec) + S_DS_GEN);
+       cmd->size = cpu_to_le16(sizeof(struct cmd_ds_get_hw_spec) + S_DS_GEN);
        memcpy(hwspec->permanentaddr, priv->adapter->current_addr, ETH_ALEN);
 
        lbs_deb_leave(LBS_DEB_CMD);
@@ -59,18 +56,16 @@ static int wlan_cmd_802_11_ps_mode(wlan_private * priv,
                                   u16 cmd_action)
 {
        struct cmd_ds_802_11_ps_mode *psm = &cmd->params.psmode;
-       u16 action = cmd_action;
        wlan_adapter *adapter = priv->adapter;
 
        lbs_deb_enter(LBS_DEB_CMD);
 
        cmd->command = cpu_to_le16(cmd_802_11_ps_mode);
-       cmd->size =
-           cpu_to_le16(sizeof(struct cmd_ds_802_11_ps_mode) +
-                            S_DS_GEN);
+       cmd->size = cpu_to_le16(sizeof(struct cmd_ds_802_11_ps_mode) +
+                               S_DS_GEN);
        psm->action = cpu_to_le16(cmd_action);
        psm->multipledtim = 0;
-       switch (action) {
+       switch (cmd_action) {
        case cmd_subcmd_enter_ps:
                lbs_deb_cmd("PS command:" "SubCode- Enter PS\n");
                lbs_deb_cmd("locallisteninterval = %d\n",
@@ -114,8 +109,7 @@ static int wlan_cmd_802_11_inactivity_timeout(wlan_private * priv,
        cmd->params.inactivity_timeout.action = cpu_to_le16(cmd_action);
 
        if (cmd_action)
-               cmd->params.inactivity_timeout.timeout =
-                   cpu_to_le16(*timeout);
+               cmd->params.inactivity_timeout.timeout = cpu_to_le16(*timeout);
        else
                cmd->params.inactivity_timeout.timeout = 0;
 
@@ -131,9 +125,8 @@ static int wlan_cmd_802_11_sleep_params(wlan_private * priv,
 
        lbs_deb_enter(LBS_DEB_CMD);
 
-       cmd->size =
-           cpu_to_le16((sizeof(struct cmd_ds_802_11_sleep_params)) +
-                            S_DS_GEN);
+       cmd->size = cpu_to_le16((sizeof(struct cmd_ds_802_11_sleep_params)) +
+                               S_DS_GEN);
        cmd->command = cpu_to_le16(cmd_802_11_sleep_params);
 
        if (cmd_action == cmd_act_get) {
@@ -167,8 +160,7 @@ static int wlan_cmd_802_11_set_wep(wlan_private * priv,
        lbs_deb_enter(LBS_DEB_CMD);
 
        cmd->command = cpu_to_le16(cmd_802_11_set_wep);
-       cmd->size = cpu_to_le16((sizeof(struct cmd_ds_802_11_set_wep))
-                                    + S_DS_GEN);
+       cmd->size = cpu_to_le16(sizeof(*wep) + S_DS_GEN);
 
        if (cmd_act == cmd_act_add) {
                int i;
@@ -182,11 +174,10 @@ static int wlan_cmd_802_11_set_wep(wlan_private * priv,
                wep->action = cpu_to_le16(cmd_act_add);
 
                /* default tx key index */
-               wep->keyindex = cpu_to_le16((u16)
-                                                (assoc_req->wep_tx_keyidx &
-                                                (u32)cmd_WEP_KEY_INDEX_MASK));
+               wep->keyindex = cpu_to_le16((u16)(assoc_req->wep_tx_keyidx &
+                                                 (u32)cmd_WEP_KEY_INDEX_MASK));
 
-               lbs_deb_cmd("Tx key Index: %u\n", wep->keyindex);
+               lbs_deb_cmd("Tx key Index: %u\n", le16_to_cpu(wep->keyindex));
 
                /* Copy key types and material to host command structure */
                for (i = 0; i < 4; i++) {
@@ -194,12 +185,14 @@ static int wlan_cmd_802_11_set_wep(wlan_private * priv,
 
                        switch (pkey->len) {
                        case KEY_LEN_WEP_40:
-                               wep->keytype[i] = cmd_type_wep_40_bit;
+                               wep->keytype[i] =
+                                       cpu_to_le16(cmd_type_wep_40_bit);
                                memmove(&wep->keymaterial[i], pkey->key,
                                        pkey->len);
                                break;
                        case KEY_LEN_WEP_104:
-                               wep->keytype[i] = cmd_type_wep_104_bit;
+                               wep->keytype[i] =
+                                       cpu_to_le16(cmd_type_wep_104_bit);
                                memmove(&wep->keymaterial[i], pkey->key,
                                        pkey->len);
                                break;
@@ -218,9 +211,8 @@ static int wlan_cmd_802_11_set_wep(wlan_private * priv,
                wep->action = cpu_to_le16(cmd_act_remove);
 
                /* default tx key index */
-               wep->keyindex = cpu_to_le16((u16)
-                                                (adapter->wep_tx_keyidx &
-                                                (u32)cmd_WEP_KEY_INDEX_MASK));
+               wep->keyindex = cpu_to_le16((u16)(adapter->wep_tx_keyidx &
+                                                 (u32)cmd_WEP_KEY_INDEX_MASK));
        }
 
        ret = 0;
@@ -241,8 +233,7 @@ static int wlan_cmd_802_11_enable_rsn(wlan_private * priv,
        lbs_deb_enter(LBS_DEB_CMD);
 
        cmd->command = cpu_to_le16(cmd_802_11_enable_rsn);
-       cmd->size = cpu_to_le16(sizeof(struct cmd_ds_802_11_enable_rsn) +
-                               S_DS_GEN);
+       cmd->size = cpu_to_le16(sizeof(*penableRSN) + S_DS_GEN);
        penableRSN->action = cpu_to_le16(cmd_action);
        if (assoc_req->secinfo.WPAenabled || assoc_req->secinfo.WPA2enabled) {
                penableRSN->enable = cpu_to_le16(cmd_enable_rsn);
@@ -353,8 +344,7 @@ static int wlan_cmd_802_11_get_stat(wlan_private * priv,
 {
        cmd->command = cpu_to_le16(cmd_802_11_get_stat);
        cmd->size =
-           cpu_to_le16(sizeof(struct cmd_ds_802_11_get_stat) +
-                            S_DS_GEN);
+           cpu_to_le16(sizeof(struct cmd_ds_802_11_get_stat) + S_DS_GEN);
 
        return 0;
 }
@@ -373,9 +363,7 @@ static int wlan_cmd_802_11_snmp_mib(wlan_private * priv,
        lbs_deb_cmd("SNMP_CMD: cmd_oid = 0x%x\n", cmd_oid);
 
        cmd->command = cpu_to_le16(cmd_802_11_snmp_mib);
-       cmd->size =
-           cpu_to_le16(sizeof(struct cmd_ds_802_11_snmp_mib) +
-                            S_DS_GEN);
+       cmd->size = cpu_to_le16(sizeof(*pSNMPMIB) + S_DS_GEN);
 
        switch (cmd_oid) {
        case OID_802_11_INFRASTRUCTURE_MODE:
@@ -406,7 +394,7 @@ static int wlan_cmd_802_11_snmp_mib(wlan_private * priv,
                                pSNMPMIB->querytype = cmd_act_set;
                                pSNMPMIB->bufsize = sizeof(u16);
                                ulTemp = *(u32 *)pdata_buf;
-                               *((unsigned short *)(pSNMPMIB->value)) =
+                               *((__le16 *)(pSNMPMIB->value)) =
                                    cpu_to_le16((u16) ulTemp);
                        }
                        break;
@@ -419,15 +407,12 @@ static int wlan_cmd_802_11_snmp_mib(wlan_private * priv,
                        pSNMPMIB->oid = cpu_to_le16((u16) fragthresh_i);
 
                        if (cmd_action == cmd_act_get) {
-                               pSNMPMIB->querytype =
-                                   cpu_to_le16(cmd_act_get);
+                               pSNMPMIB->querytype = cpu_to_le16(cmd_act_get);
                        } else if (cmd_action == cmd_act_set) {
-                               pSNMPMIB->querytype =
-                                   cpu_to_le16(cmd_act_set);
-                               pSNMPMIB->bufsize =
-                                   cpu_to_le16(sizeof(u16));
+                               pSNMPMIB->querytype = cpu_to_le16(cmd_act_set);
+                               pSNMPMIB->bufsize = cpu_to_le16(sizeof(u16));
                                ulTemp = *((u32 *) pdata_buf);
-                               *((unsigned short *)(pSNMPMIB->value)) =
+                               *((__le16 *)(pSNMPMIB->value)) =
                                    cpu_to_le16((u16) ulTemp);
 
                        }
@@ -442,16 +427,12 @@ static int wlan_cmd_802_11_snmp_mib(wlan_private * priv,
                        pSNMPMIB->oid = le16_to_cpu((u16) rtsthresh_i);
 
                        if (cmd_action == cmd_act_get) {
-                               pSNMPMIB->querytype =
-                                   cpu_to_le16(cmd_act_get);
+                               pSNMPMIB->querytype = cpu_to_le16(cmd_act_get);
                        } else if (cmd_action == cmd_act_set) {
-                               pSNMPMIB->querytype =
-                                   cpu_to_le16(cmd_act_set);
-                               pSNMPMIB->bufsize =
-                                   cpu_to_le16(sizeof(u16));
-                               ulTemp = *((u32 *)
-                                          pdata_buf);
-                               *(unsigned short *)(pSNMPMIB->value) =
+                               pSNMPMIB->querytype = cpu_to_le16(cmd_act_set);
+                               pSNMPMIB->bufsize = cpu_to_le16(sizeof(u16));
+                               ulTemp = *((u32 *)pdata_buf);
+                               *(__le16 *)(pSNMPMIB->value) =
                                    cpu_to_le16((u16) ulTemp);
 
                        }
@@ -461,13 +442,11 @@ static int wlan_cmd_802_11_snmp_mib(wlan_private * priv,
                pSNMPMIB->oid = cpu_to_le16((u16) short_retrylim_i);
 
                if (cmd_action == cmd_act_get) {
-                       pSNMPMIB->querytype =
-                           cpu_to_le16(cmd_act_get);
+                       pSNMPMIB->querytype = cpu_to_le16(cmd_act_get);
                } else if (cmd_action == cmd_act_set) {
-                       pSNMPMIB->querytype =
-                           cpu_to_le16(cmd_act_set);
+                       pSNMPMIB->querytype = cpu_to_le16(cmd_act_set);
                        pSNMPMIB->bufsize = cpu_to_le16(sizeof(u16));
-                       *((unsigned short *)(pSNMPMIB->value)) =
+                       *((__le16 *)(pSNMPMIB->value)) =
                            cpu_to_le16((u16) adapter->txretrycount);
                }
 
@@ -478,12 +457,14 @@ static int wlan_cmd_802_11_snmp_mib(wlan_private * priv,
 
        lbs_deb_cmd(
               "SNMP_CMD: command=0x%x, size=0x%x, seqnum=0x%x, result=0x%x\n",
-              cmd->command, cmd->size, cmd->seqnum, cmd->result);
+              le16_to_cpu(cmd->command), le16_to_cpu(cmd->size),
+              le16_to_cpu(cmd->seqnum), le16_to_cpu(cmd->result));
 
        lbs_deb_cmd(
               "SNMP_CMD: action=0x%x, oid=0x%x, oidsize=0x%x, value=0x%x\n",
-              pSNMPMIB->querytype, pSNMPMIB->oid, pSNMPMIB->bufsize,
-              *(u16 *) pSNMPMIB->value);
+              le16_to_cpu(pSNMPMIB->querytype), le16_to_cpu(pSNMPMIB->oid),
+              le16_to_cpu(pSNMPMIB->bufsize),
+              le16_to_cpu(*(__le16 *) pSNMPMIB->value));
 
        lbs_deb_leave(LBS_DEB_CMD);
        return 0;
@@ -494,8 +475,7 @@ static int wlan_cmd_802_11_radio_control(wlan_private * priv,
                                         int cmd_action)
 {
        wlan_adapter *adapter = priv->adapter;
-       struct cmd_ds_802_11_radio_control *pradiocontrol =
-           &cmd->params.radio;
+       struct cmd_ds_802_11_radio_control *pradiocontrol = &cmd->params.radio;
 
        lbs_deb_enter(LBS_DEB_CMD);
 
@@ -540,13 +520,13 @@ static int wlan_cmd_802_11_rf_tx_power(wlan_private * priv,
        lbs_deb_enter(LBS_DEB_CMD);
 
        cmd->size =
-           cpu_to_le16((sizeof(struct cmd_ds_802_11_rf_tx_power)) +
-                            S_DS_GEN);
+           cpu_to_le16((sizeof(struct cmd_ds_802_11_rf_tx_power)) + S_DS_GEN);
        cmd->command = cpu_to_le16(cmd_802_11_rf_tx_power);
-       prtp->action = cmd_action;
+       prtp->action = cpu_to_le16(cmd_action);
 
-       lbs_deb_cmd("RF_TX_POWER_CMD: size:%d cmd:0x%x Act:%d\n", cmd->size,
-              cmd->command, prtp->action);
+       lbs_deb_cmd("RF_TX_POWER_CMD: size:%d cmd:0x%x Act:%d\n",
+                   le16_to_cpu(cmd->size), le16_to_cpu(cmd->command),
+                   le16_to_cpu(prtp->action));
 
        switch (cmd_action) {
        case cmd_act_tx_power_opt_get:
@@ -556,14 +536,12 @@ static int wlan_cmd_802_11_rf_tx_power(wlan_private * priv,
 
        case cmd_act_tx_power_opt_set_high:
                prtp->action = cpu_to_le16(cmd_act_set);
-               prtp->currentlevel =
-                   cpu_to_le16(cmd_act_tx_power_index_high);
+               prtp->currentlevel = cpu_to_le16(cmd_act_tx_power_index_high);
                break;
 
        case cmd_act_tx_power_opt_set_mid:
                prtp->action = cpu_to_le16(cmd_act_set);
-               prtp->currentlevel =
-                   cpu_to_le16(cmd_act_tx_power_index_mid);
+               prtp->currentlevel = cpu_to_le16(cmd_act_tx_power_index_mid);
                break;
 
        case cmd_act_tx_power_opt_set_low:
@@ -583,15 +561,12 @@ static int wlan_cmd_802_11_rf_antenna(wlan_private * priv,
        struct cmd_ds_802_11_rf_antenna *rant = &cmd->params.rant;
 
        cmd->command = cpu_to_le16(cmd_802_11_rf_antenna);
-       cmd->size =
-           cpu_to_le16(sizeof(struct cmd_ds_802_11_rf_antenna) +
-                            S_DS_GEN);
+       cmd->size = cpu_to_le16(sizeof(struct cmd_ds_802_11_rf_antenna) +
+                               S_DS_GEN);
 
        rant->action = cpu_to_le16(cmd_action);
-       if ((cmd_action == cmd_act_set_rx) ||
-           (cmd_action == cmd_act_set_tx)) {
-               rant->antennamode =
-                   cpu_to_le16((u16) (*(u32 *) pdata_buf));
+       if ((cmd_action == cmd_act_set_rx) || (cmd_action == cmd_act_set_tx)) {
+               rant->antennamode = cpu_to_le16((u16) (*(u32 *) pdata_buf));
        }
 
        return 0;
@@ -612,9 +587,9 @@ static int wlan_cmd_802_11_rate_adapt_rateset(wlan_private * priv,
 
        lbs_deb_enter(LBS_DEB_CMD);
 
-       rateadapt->action = cmd_action;
-       rateadapt->enablehwauto = adapter->enablehwauto;
-       rateadapt->bitmap = adapter->ratebitmap;
+       rateadapt->action = cpu_to_le16(cmd_action);
+       rateadapt->enablehwauto = cpu_to_le16(adapter->enablehwauto);
+       rateadapt->bitmap = cpu_to_le16(adapter->ratebitmap);
 
        lbs_deb_leave(LBS_DEB_CMD);
        return 0;
@@ -626,12 +601,10 @@ static int wlan_cmd_802_11_data_rate(wlan_private * priv,
 {
        struct cmd_ds_802_11_data_rate *pdatarate = &cmd->params.drate;
        wlan_adapter *adapter = priv->adapter;
-       u16 action = cmd_action;
 
        lbs_deb_enter(LBS_DEB_CMD);
 
-       cmd->size =
-           cpu_to_le16(sizeof(struct cmd_ds_802_11_data_rate) +
+       cmd->size = cpu_to_le16(sizeof(struct cmd_ds_802_11_data_rate) +
                             S_DS_GEN);
 
        cmd->command = cpu_to_le16(cmd_802_11_data_rate);
@@ -640,11 +613,11 @@ static int wlan_cmd_802_11_data_rate(wlan_private * priv,
 
        pdatarate->action = cpu_to_le16(cmd_action);
 
-       if (action == cmd_act_set_tx_fix_rate) {
+       if (cmd_action == cmd_act_set_tx_fix_rate) {
                pdatarate->datarate[0] = libertas_data_rate_to_index(adapter->datarate);
                lbs_deb_cmd("Setting FW for fixed rate 0x%02X\n",
                       adapter->datarate);
-       } else if (action == cmd_act_set_tx_auto) {
+       } else if (cmd_action == cmd_act_set_tx_auto) {
                lbs_deb_cmd("Setting FW for AUTO rate\n");
        }
 
@@ -659,8 +632,7 @@ static int wlan_cmd_mac_multicast_adr(wlan_private * priv,
        struct cmd_ds_mac_multicast_adr *pMCastAdr = &cmd->params.madr;
        wlan_adapter *adapter = priv->adapter;
 
-       cmd->size =
-           cpu_to_le16(sizeof(struct cmd_ds_mac_multicast_adr) +
+       cmd->size = cpu_to_le16(sizeof(struct cmd_ds_mac_multicast_adr) +
                             S_DS_GEN);
        cmd->command = cpu_to_le16(cmd_mac_multicast_adr);
 
@@ -680,8 +652,8 @@ static int wlan_cmd_802_11_rf_channel(wlan_private * priv,
        struct cmd_ds_802_11_rf_channel *rfchan = &cmd->params.rfchannel;
 
        cmd->command = cpu_to_le16(cmd_802_11_rf_channel);
-       cmd->size = cpu_to_le16(sizeof(struct cmd_ds_802_11_rf_channel)
-                                    + S_DS_GEN);
+       cmd->size = cpu_to_le16(sizeof(struct cmd_ds_802_11_rf_channel) +
+                               S_DS_GEN);
 
        if (option == cmd_opt_802_11_rf_channel_set) {
                rfchan->currentchannel = cpu_to_le16(*((u16 *) pdata_buf));
@@ -698,9 +670,8 @@ static int wlan_cmd_802_11_rssi(wlan_private * priv,
        wlan_adapter *adapter = priv->adapter;
 
        cmd->command = cpu_to_le16(cmd_802_11_rssi);
-       cmd->size =
-           cpu_to_le16(sizeof(struct cmd_ds_802_11_rssi) + S_DS_GEN);
-       cmd->params.rssi.N = priv->adapter->bcn_avg_factor;
+       cmd->size = cpu_to_le16(sizeof(struct cmd_ds_802_11_rssi) + S_DS_GEN);
+       cmd->params.rssi.N = cpu_to_le16(priv->adapter->bcn_avg_factor);
 
        /* reset Beacon SNR/NF/RSSI values */
        adapter->SNR[TYPE_BEACON][TYPE_NOAVG] = 0;
@@ -729,9 +700,8 @@ static int wlan_cmd_reg_access(wlan_private * priv,
                        struct cmd_ds_mac_reg_access *macreg;
 
                        cmdptr->size =
-                           cpu_to_le16(sizeof
-                                            (struct cmd_ds_mac_reg_access)
-                                            + S_DS_GEN);
+                           cpu_to_le16(sizeof (struct cmd_ds_mac_reg_access)
+                                       + S_DS_GEN);
                        macreg =
                            (struct cmd_ds_mac_reg_access *)&cmdptr->params.
                            macreg;
@@ -796,8 +766,7 @@ static int wlan_cmd_802_11_mac_address(wlan_private * priv,
        wlan_adapter *adapter = priv->adapter;
 
        cmd->command = cpu_to_le16(cmd_802_11_mac_address);
-       cmd->size =
-           cpu_to_le16(sizeof(struct cmd_ds_802_11_mac_address) +
+       cmd->size = cpu_to_le16(sizeof(struct cmd_ds_802_11_mac_address) +
                             S_DS_GEN);
        cmd->result = 0;
 
@@ -821,9 +790,8 @@ static int wlan_cmd_802_11_eeprom_access(wlan_private * priv,
        lbs_deb_enter(LBS_DEB_CMD);
 
        cmd->command = cpu_to_le16(cmd_802_11_eeprom_access);
-       cmd->size =
-           cpu_to_le16(sizeof(struct cmd_ds_802_11_eeprom_access) +
-                            S_DS_GEN);
+       cmd->size = cpu_to_le16(sizeof(struct cmd_ds_802_11_eeprom_access) +
+                               S_DS_GEN);
        cmd->result = 0;
 
        cmd->params.rdeeprom.action = cpu_to_le16(ea->action);
@@ -842,8 +810,7 @@ static int wlan_cmd_bt_access(wlan_private * priv,
        lbs_deb_cmd("BT CMD(%d)\n", cmd_action);
 
        cmd->command = cpu_to_le16(cmd_bt_access);
-       cmd->size = cpu_to_le16(sizeof(struct cmd_ds_bt_access)
-                                    + S_DS_GEN);
+       cmd->size = cpu_to_le16(sizeof(struct cmd_ds_bt_access) + S_DS_GEN);
        cmd->result = 0;
        bt_access->action = cpu_to_le16(cmd_action);
 
@@ -880,8 +847,7 @@ static int wlan_cmd_fwt_access(wlan_private * priv,
        lbs_deb_cmd("FWT CMD(%d)\n", cmd_action);
 
        cmd->command = cpu_to_le16(cmd_fwt_access);
-       cmd->size = cpu_to_le16(sizeof(struct cmd_ds_fwt_access)
-                                    + S_DS_GEN);
+       cmd->size = cpu_to_le16(sizeof(struct cmd_ds_fwt_access) + S_DS_GEN);
        cmd->result = 0;
 
        if (pdata_buf)
@@ -902,8 +868,7 @@ static int wlan_cmd_mesh_access(wlan_private * priv,
        lbs_deb_cmd("FWT CMD(%d)\n", cmd_action);
 
        cmd->command = cpu_to_le16(cmd_mesh_access);
-       cmd->size = cpu_to_le16(sizeof(struct cmd_ds_mesh_access)
-                                    + S_DS_GEN);
+       cmd->size = cpu_to_le16(sizeof(struct cmd_ds_mesh_access) + S_DS_GEN);
        cmd->result = 0;
 
        if (pdata_buf)
@@ -937,7 +902,7 @@ void libertas_queue_cmd(wlan_adapter * adapter, struct cmd_ctrl_node *cmdnode, u
        /* Exit_PS command needs to be queued in the header always. */
        if (cmdptr->command == cmd_802_11_ps_mode) {
                struct cmd_ds_802_11_ps_mode *psm = &cmdptr->params.psmode;
-               if (psm->action == cmd_subcmd_exit_ps) {
+               if (psm->action == cpu_to_le16(cmd_subcmd_exit_ps)) {
                        if (adapter->psstate != PS_STATE_FULL_POWER)
                                addtail = 0;
                }
@@ -955,7 +920,7 @@ void libertas_queue_cmd(wlan_adapter * adapter, struct cmd_ctrl_node *cmdnode, u
 
        lbs_deb_cmd("QUEUE_CMD: Inserted node=%p, cmd=0x%x in cmdpendingq\n",
               cmdnode,
-              ((struct cmd_ds_gen*)cmdnode->bufvirtualaddr)->command);
+              le16_to_cpu(((struct cmd_ds_gen*)cmdnode->bufvirtualaddr)->command));
 
 done:
        lbs_deb_leave(LBS_DEB_CMD);
@@ -1009,7 +974,7 @@ static int DownloadcommandToStation(wlan_private * priv,
        adapter->cur_cmd_retcode = 0;
        spin_unlock_irqrestore(&adapter->driver_lock, flags);
        lbs_deb_cmd("DNLD_CMD:: Before download, size of cmd = %d\n",
-              cmdptr->size);
+                   le16_to_cpu(cmdptr->size));
 
        cmdsize = cmdptr->size;
 
@@ -1034,8 +999,7 @@ static int DownloadcommandToStation(wlan_private * priv,
        lbs_dbg_hex("DNLD_CMD: command", cmdnode->bufvirtualaddr, cmdsize);
 
        /* Setup the timer after transmit command */
-       if (command == cmd_802_11_scan
-           || command == cmd_802_11_authenticate
+       if (command == cmd_802_11_scan || command == cmd_802_11_authenticate
            || command == cmd_802_11_associate)
                mod_timer(&adapter->command_timer, jiffies + (10*HZ));
        else
@@ -1056,12 +1020,11 @@ static int wlan_cmd_mac_control(wlan_private * priv,
        lbs_deb_enter(LBS_DEB_CMD);
 
        cmd->command = cpu_to_le16(cmd_mac_control);
-       cmd->size =
-           cpu_to_le16(sizeof(struct cmd_ds_mac_control) + S_DS_GEN);
+       cmd->size = cpu_to_le16(sizeof(struct cmd_ds_mac_control) + S_DS_GEN);
        mac->action = cpu_to_le16(priv->adapter->currentpacketfilter);
 
        lbs_deb_cmd("wlan_cmd_mac_control(): action=0x%X size=%d\n",
-              mac->action, cmd->size);
+                   le16_to_cpu(mac->action), le16_to_cpu(cmd->size));
 
        lbs_deb_leave(LBS_DEB_CMD);
        return 0;
@@ -1193,7 +1156,7 @@ int libertas_prepare_and_send_command(wlan_private * priv,
        adapter->seqnum++;
        cmdptr->seqnum = cpu_to_le16(adapter->seqnum);
 
-       cmdptr->command = cmd_no;
+       cmdptr->command = cpu_to_le16(cmd_no);
        cmdptr->result = 0;
 
        switch (cmd_no) {
@@ -1329,9 +1292,8 @@ int libertas_prepare_and_send_command(wlan_private * priv,
        case cmd_802_11_get_afc:
 
                cmdptr->command = cpu_to_le16(cmd_no);
-               cmdptr->size =
-                   cpu_to_le16(sizeof(struct cmd_ds_802_11_afc) +
-                                    S_DS_GEN);
+               cmdptr->size = cpu_to_le16(sizeof(struct cmd_ds_802_11_afc) +
+                                          S_DS_GEN);
 
                memmove(&cmdptr->params.afc,
                        pdata_buf, sizeof(struct cmd_ds_802_11_afc));
@@ -1410,17 +1372,14 @@ int libertas_prepare_and_send_command(wlan_private * priv,
 
        case cmd_get_tsf:
                cmdptr->command = cpu_to_le16(cmd_get_tsf);
-               cmdptr->size =
-                   cpu_to_le16(sizeof(struct cmd_ds_get_tsf)
-                                    + S_DS_GEN);
+               cmdptr->size = cpu_to_le16(sizeof(struct cmd_ds_get_tsf) +
+                                          S_DS_GEN);
                ret = 0;
                break;
        case cmd_802_11_tx_rate_query:
-               cmdptr->command =
-                   cpu_to_le16(cmd_802_11_tx_rate_query);
-               cmdptr->size =
-                   cpu_to_le16(sizeof(struct cmd_tx_rate_query) +
-                                    S_DS_GEN);
+               cmdptr->command = cpu_to_le16(cmd_802_11_tx_rate_query);
+               cmdptr->size = cpu_to_le16(sizeof(struct cmd_tx_rate_query) +
+                                          S_DS_GEN);
                adapter->txrate = 0;
                ret = 0;
                break;
@@ -1529,7 +1488,7 @@ done:
  */
 int libertas_free_cmd_buffer(wlan_private * priv)
 {
-       u32 ulbufsize;
+       u32 ulbufsize; /* Someone needs to die for this. Slowly and painfully */
        unsigned int i;
        struct cmd_ctrl_node *tempcmd_array;
        wlan_adapter *adapter = priv->adapter;
@@ -1694,18 +1653,19 @@ int libertas_execute_next_command(wlan_private * priv)
                cmdptr = (struct cmd_ds_command *)cmdnode->bufvirtualaddr;
 
                if (is_command_allowed_in_ps(cmdptr->command)) {
-                       if ((adapter->psstate == PS_STATE_SLEEP)
-                           || (adapter->psstate == PS_STATE_PRE_SLEEP)
-                           ) {
+                       if ((adapter->psstate == PS_STATE_SLEEP) ||
+                           (adapter->psstate == PS_STATE_PRE_SLEEP)) {
                                lbs_deb_cmd(
                                       "EXEC_NEXT_CMD: Cannot send cmd 0x%x in psstate %d\n",
-                                      cmdptr->command, adapter->psstate);
+                                      le16_to_cpu(cmdptr->command),
+                                      adapter->psstate);
                                ret = -1;
                                goto done;
                        }
                        lbs_deb_cmd("EXEC_NEXT_CMD: OK to send command "
                               "0x%x in psstate %d\n",
-                              cmdptr->command, adapter->psstate);
+                                   le16_to_cpu(cmdptr->command),
+                                   adapter->psstate);
                } else if (adapter->psstate != PS_STATE_FULL_POWER) {
                        /*
                         * 1. Non-PS command:
@@ -1755,9 +1715,8 @@ int libertas_execute_next_command(wlan_private * priv)
                                        goto done;
                                }
 
-                               if ((adapter->psstate == PS_STATE_SLEEP)
-                                   || (adapter->psstate == PS_STATE_PRE_SLEEP)
-                                   ) {
+                               if ((adapter->psstate == PS_STATE_SLEEP) ||
+                                   (adapter->psstate == PS_STATE_PRE_SLEEP)) {
                                        lbs_deb_cmd(
                                               "EXEC_NEXT_CMD: Ignore ExitPS cmd in sleep\n");
                                        list_del((struct list_head *)cmdnode);
@@ -1774,7 +1733,7 @@ int libertas_execute_next_command(wlan_private * priv)
                }
                list_del((struct list_head *)cmdnode);
                lbs_deb_cmd("EXEC_NEXT_CMD: Sending 0x%04X command\n",
-                      cmdptr->command);
+                           le16_to_cpu(cmdptr->command));
                DownloadcommandToStation(priv, cmdnode);
        } else {
                /*
@@ -1784,11 +1743,11 @@ int libertas_execute_next_command(wlan_private * priv)
                if ((adapter->psmode != wlan802_11powermodecam) &&
                    (adapter->psstate == PS_STATE_FULL_POWER) &&
                    (adapter->connect_status == libertas_connected)) {
-                       if (adapter->secinfo.WPAenabled
-                           || adapter->secinfo.WPA2enabled) {
+                       if (adapter->secinfo.WPAenabled ||
+                           adapter->secinfo.WPA2enabled) {
                                /* check for valid WPA group keys */
-                               if (adapter->wpa_mcast_key.len
-                                   || adapter->wpa_unicast_key.len) {
+                               if (adapter->wpa_mcast_key.len ||
+                                   adapter->wpa_unicast_key.len) {
                                        lbs_deb_cmd(
                                               "EXEC_NEXT_CMD: WPA enabled and GTK_SET"
                                               " go back to PS_SLEEP");
@@ -1824,8 +1783,7 @@ void libertas_send_iwevcustom_event(wlan_private * priv, s8 * str)
        iwrq.data.length = strlen(buf) + 1 + IW_EV_LCP_LEN;
 
        /* Send Event to upper layer */
-       lbs_deb_cmd("Event Indication string = %s\n",
-              (char *)buf);
+       lbs_deb_cmd("Event Indication string = %s\n", (char *)buf);
        lbs_deb_cmd("Event Indication String length = %d\n", iwrq.data.length);
 
        lbs_deb_cmd("Sending wireless event IWEVCUSTOM for %s\n", str);
@@ -1901,13 +1859,13 @@ void libertas_ps_sleep(wlan_private * priv, int wait_option)
  */
 void libertas_ps_wakeup(wlan_private * priv, int wait_option)
 {
-       enum WLAN_802_11_POWER_MODE Localpsmode;
+       __le32 Localpsmode;
 
        lbs_deb_enter(LBS_DEB_CMD);
 
-       Localpsmode = wlan802_11powermodecam;
+       Localpsmode = cpu_to_le32(wlan802_11powermodecam);
 
-       lbs_deb_cmd("Exit_PS: Localpsmode = %d\n", Localpsmode);
+       lbs_deb_cmd("Exit_PS: Localpsmode = %d\n", wlan802_11powermodecam);
 
        libertas_prepare_and_send_command(priv, cmd_802_11_ps_mode,
                              cmd_subcmd_exit_ps,
index 3b069341f35ff22205ad34827f6afe9eb08474fb..e31d595e4753a1cb86b0f82d4cabbbacb27e903d 100644 (file)
@@ -123,37 +123,27 @@ static int wlan_ret_reg_access(wlan_private * priv,
        switch (type) {
        case cmd_ret_mac_reg_access:
                {
-                       struct cmd_ds_mac_reg_access *reg;
+                       struct cmd_ds_mac_reg_access *reg = &resp->params.macreg;
 
-                       reg =
-                           (struct cmd_ds_mac_reg_access *)&resp->params.
-                           macreg;
-
-                       adapter->offsetvalue.offset = reg->offset;
-                       adapter->offsetvalue.value = reg->value;
+                       adapter->offsetvalue.offset = (u32)le16_to_cpu(reg->offset);
+                       adapter->offsetvalue.value = le32_to_cpu(reg->value);
                        break;
                }
 
        case cmd_ret_bbp_reg_access:
                {
-                       struct cmd_ds_bbp_reg_access *reg;
-                       reg =
-                           (struct cmd_ds_bbp_reg_access *)&resp->params.
-                           bbpreg;
+                       struct cmd_ds_bbp_reg_access *reg = &resp->params.bbpreg;
 
-                       adapter->offsetvalue.offset = reg->offset;
+                       adapter->offsetvalue.offset = (u32)le16_to_cpu(reg->offset);
                        adapter->offsetvalue.value = reg->value;
                        break;
                }
 
        case cmd_ret_rf_reg_access:
                {
-                       struct cmd_ds_rf_reg_access *reg;
-                       reg =
-                           (struct cmd_ds_rf_reg_access *)&resp->params.
-                           rfreg;
+                       struct cmd_ds_rf_reg_access *reg = &resp->params.rfreg;
 
-                       adapter->offsetvalue.offset = reg->offset;
+                       adapter->offsetvalue.offset = (u32)le16_to_cpu(reg->offset);
                        adapter->offsetvalue.value = reg->value;
                        break;
                }
@@ -178,7 +168,7 @@ static int wlan_ret_get_hw_spec(wlan_private * priv,
 
        adapter->fwcapinfo = le32_to_cpu(hwspec->fwcapinfo);
 
-       adapter->fwreleasenumber = hwspec->fwreleasenumber;
+       adapter->fwreleasenumber = le32_to_cpu(hwspec->fwreleasenumber);
 
        lbs_deb_cmd("GET_HW_SPEC: FWReleaseVersion- 0x%X\n",
               adapter->fwreleasenumber);
@@ -203,19 +193,15 @@ static int wlan_ret_get_hw_spec(wlan_private * priv,
        if (i >= MRVDRV_MAX_REGION_CODE) {
                adapter->regioncode = 0x10;
                adapter->regiontableindex = 0;
-               lbs_pr_info(
-                      "unidentified region code, use the default (USA)\n");
+               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);
-       }
+       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);
+               memcpy(priv->mesh_dev->dev_addr, adapter->current_addr, ETH_ALEN);
 
        if (libertas_set_regiontable(priv, adapter->regioncode, 0)) {
                ret = -1;
@@ -241,13 +227,15 @@ static int wlan_ret_802_11_sleep_params(wlan_private * priv,
        lbs_deb_enter(LBS_DEB_CMD);
 
        lbs_deb_cmd("error=%x offset=%x stabletime=%x calcontrol=%x\n"
-              " extsleepclk=%x\n", sp->error, sp->offset,
-              sp->stabletime, sp->calcontrol, sp->externalsleepclk);
+                   " extsleepclk=%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 = le16_to_cpu(sp->calcontrol);
-       adapter->sp.sp_extsleepclk = le16_to_cpu(sp->externalsleepclk);
+       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);
@@ -280,31 +268,27 @@ static int wlan_ret_802_11_snmp_mib(wlan_private * priv,
 
        lbs_deb_cmd("SNMP_RESP: value of the oid = %x, querytype=%x\n", oid,
               querytype);
-       lbs_deb_cmd("SNMP_RESP: Buf size  = %x\n",
-              le16_to_cpu(smib->bufsize));
+       lbs_deb_cmd("SNMP_RESP: Buf size  = %x\n", le16_to_cpu(smib->bufsize));
 
        if (querytype == cmd_act_get) {
                switch (oid) {
                case fragthresh_i:
                        priv->adapter->fragthsd =
-                           le16_to_cpu(*
-                                            ((unsigned short *)(smib->value)));
+                               le16_to_cpu(*((__le16 *)(smib->value)));
                        lbs_deb_cmd("SNMP_RESP: fragthsd =%u\n",
-                              priv->adapter->fragthsd);
+                                   priv->adapter->fragthsd);
                        break;
                case rtsthresh_i:
                        priv->adapter->rtsthsd =
-                           le16_to_cpu(*
-                                            ((unsigned short *)(smib->value)));
+                               le16_to_cpu(*((__le16 *)(smib->value)));
                        lbs_deb_cmd("SNMP_RESP: rtsthsd =%u\n",
-                              priv->adapter->rtsthsd);
+                                   priv->adapter->rtsthsd);
                        break;
                case short_retrylim_i:
                        priv->adapter->txretrycount =
-                           le16_to_cpu(*
-                                            ((unsigned short *)(smib->value)));
+                               le16_to_cpu(*((__le16 *)(smib->value)));
                        lbs_deb_cmd("SNMP_RESP: txretrycount =%u\n",
-                              priv->adapter->rtsthsd);
+                                   priv->adapter->rtsthsd);
                        break;
                default:
                        break;
@@ -408,12 +392,10 @@ static int wlan_ret_802_11_rf_antenna(wlan_private * priv,
        u16 action = le16_to_cpu(pAntenna->action);
 
        if (action == cmd_act_get_rx)
-               adapter->rxantennamode =
-                   le16_to_cpu(pAntenna->antennamode);
+               adapter->rxantennamode = le16_to_cpu(pAntenna->antennamode);
 
        if (action == cmd_act_get_tx)
-               adapter->txantennamode =
-                   le16_to_cpu(pAntenna->antennamode);
+               adapter->txantennamode = le16_to_cpu(pAntenna->antennamode);
 
        lbs_deb_cmd("RF_ANT_RESP: action = 0x%x, mode = 0x%04x\n",
               action, le16_to_cpu(pAntenna->antennamode));
@@ -424,15 +406,14 @@ static int wlan_ret_802_11_rf_antenna(wlan_private * priv,
 static int wlan_ret_802_11_rate_adapt_rateset(wlan_private * priv,
                                              struct cmd_ds_command *resp)
 {
-       struct cmd_ds_802_11_rate_adapt_rateset *rates =
-           &resp->params.rateset;
+       struct cmd_ds_802_11_rate_adapt_rateset *rates = &resp->params.rateset;
        wlan_adapter *adapter = priv->adapter;
 
        lbs_deb_enter(LBS_DEB_CMD);
 
        if (rates->action == cmd_act_get) {
-               adapter->enablehwauto = rates->enablehwauto;
-               adapter->ratebitmap = rates->bitmap;
+               adapter->enablehwauto = le16_to_cpu(rates->enablehwauto);
+               adapter->ratebitmap = le16_to_cpu(rates->bitmap);
        }
 
        lbs_deb_enter(LBS_DEB_CMD);
@@ -452,7 +433,7 @@ static int wlan_ret_802_11_data_rate(wlan_private * priv,
                (u8 *) pdatarate, sizeof(struct cmd_ds_802_11_data_rate));
 
        dot11datarate = pdatarate->datarate[0];
-       if (pdatarate->action == cmd_act_get_tx_rate) {
+       if (pdatarate->action == cpu_to_le16(cmd_act_get_tx_rate)) {
                memcpy(adapter->libertas_supported_rates, pdatarate->datarate,
                       sizeof(adapter->libertas_supported_rates));
        }
@@ -465,8 +446,7 @@ static int wlan_ret_802_11_data_rate(wlan_private * priv,
 static int wlan_ret_802_11_rf_channel(wlan_private * priv,
                                      struct cmd_ds_command *resp)
 {
-       struct cmd_ds_802_11_rf_channel *rfchannel =
-           &resp->params.rfchannel;
+       struct cmd_ds_802_11_rf_channel *rfchannel = &resp->params.rfchannel;
        wlan_adapter *adapter = priv->adapter;
        u16 action = le16_to_cpu(rfchannel->action);
        u16 newchannel = le16_to_cpu(rfchannel->currentchannel);
@@ -494,12 +474,10 @@ static int wlan_ret_802_11_rssi(wlan_private * priv,
 
        /* 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);
+       adapter->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);
+       adapter->NF[TYPE_BEACON][TYPE_AVG] = le16_to_cpu(rssirsp->avgnoisefloor);
 
        adapter->RSSI[TYPE_BEACON][TYPE_NOAVG] =
            CAL_RSSI(adapter->SNR[TYPE_BEACON][TYPE_NOAVG],
@@ -543,15 +521,13 @@ static int wlan_ret_802_11_eeprom_access(wlan_private * priv,
 static int wlan_ret_get_log(wlan_private * priv,
                            struct cmd_ds_command *resp)
 {
-       struct cmd_ds_802_11_get_log *logmessage =
-           (struct cmd_ds_802_11_get_log *)&resp->params.glog;
+       struct cmd_ds_802_11_get_log *logmessage = &resp->params.glog;
        wlan_adapter *adapter = priv->adapter;
 
        lbs_deb_enter(LBS_DEB_CMD);
 
-       /* TODO Convert it to Big Endian before copy */
-       memcpy(&adapter->logmsg, logmessage,
-              sizeof(struct cmd_ds_802_11_get_log));
+       /* Stored little-endian */
+       memcpy(&adapter->logmsg, logmessage, sizeof(struct cmd_ds_802_11_get_log));
 
        lbs_deb_enter(LBS_DEB_CMD);
        return 0;
@@ -614,8 +590,7 @@ static inline int handle_cmd_response(u16 respcmd,
        case cmd_ret_802_11_set_afc:
        case cmd_ret_802_11_get_afc:
                spin_lock_irqsave(&adapter->driver_lock, flags);
-               memmove(adapter->cur_cmd->pdata_buf,
-                       &resp->params.afc,
+               memmove(adapter->cur_cmd->pdata_buf, &resp->params.afc,
                        sizeof(struct cmd_ds_802_11_afc));
                spin_unlock_irqrestore(&adapter->driver_lock, flags);
 
@@ -681,22 +656,19 @@ static inline int handle_cmd_response(u16 respcmd,
 
        case cmd_ret_802_11_tpc_cfg:
                spin_lock_irqsave(&adapter->driver_lock, flags);
-               memmove(adapter->cur_cmd->pdata_buf,
-                       &resp->params.tpccfg,
+               memmove(adapter->cur_cmd->pdata_buf, &resp->params.tpccfg,
                        sizeof(struct cmd_ds_802_11_tpc_cfg));
                spin_unlock_irqrestore(&adapter->driver_lock, flags);
                break;
        case cmd_ret_802_11_led_gpio_ctrl:
                spin_lock_irqsave(&adapter->driver_lock, flags);
-               memmove(adapter->cur_cmd->pdata_buf,
-                       &resp->params.ledgpio,
+               memmove(adapter->cur_cmd->pdata_buf, &resp->params.ledgpio,
                        sizeof(struct cmd_ds_802_11_led_ctrl));
                spin_unlock_irqrestore(&adapter->driver_lock, flags);
                break;
        case cmd_ret_802_11_pwr_cfg:
                spin_lock_irqsave(&adapter->driver_lock, flags);
-               memmove(adapter->cur_cmd->pdata_buf,
-                       &resp->params.pwrcfg,
+               memmove(adapter->cur_cmd->pdata_buf, &resp->params.pwrcfg,
                        sizeof(struct cmd_ds_802_11_pwr_cfg));
                spin_unlock_irqrestore(&adapter->driver_lock, flags);
 
@@ -718,15 +690,13 @@ static inline int handle_cmd_response(u16 respcmd,
        case cmd_ret_fwt_access:
                spin_lock_irqsave(&adapter->driver_lock, flags);
                if (adapter->cur_cmd->pdata_buf)
-                       memcpy(adapter->cur_cmd->pdata_buf,
-                              &resp->params.fwt,
-                               sizeof(resp->params.fwt));
+                       memcpy(adapter->cur_cmd->pdata_buf, &resp->params.fwt,
+                              sizeof(resp->params.fwt));
                spin_unlock_irqrestore(&adapter->driver_lock, flags);
                break;
        case cmd_ret_mesh_access:
                if (adapter->cur_cmd->pdata_buf)
-                       memcpy(adapter->cur_cmd->pdata_buf,
-                              &resp->params.mesh,
+                       memcpy(adapter->cur_cmd->pdata_buf, &resp->params.mesh,
                               sizeof(resp->params.mesh));
                break;
        case cmd_rte_802_11_tx_rate_query:
@@ -734,7 +704,7 @@ static inline int handle_cmd_response(u16 respcmd,
                break;
        default:
                lbs_deb_cmd("CMD_RESP: Unknown command response %#x\n",
-                      resp->command);
+                           resp->command);
                break;
        }
        return ret;
@@ -768,14 +738,14 @@ int libertas_process_rx_command(wlan_private * priv)
        resp = (struct cmd_ds_command *)(adapter->cur_cmd->bufvirtualaddr);
 
        lbs_dbg_hex("CMD_RESP:", adapter->cur_cmd->bufvirtualaddr,
-               priv->upld_len);
+                   priv->upld_len);
 
        respcmd = le16_to_cpu(resp->command);
 
        result = le16_to_cpu(resp->result);
 
        lbs_deb_cmd("CMD_RESP: %x result: %d length: %d\n", respcmd,
-              result, priv->upld_len);
+                   result, priv->upld_len);
 
        if (!(respcmd & 0x8000)) {
                lbs_deb_cmd("Invalid response to command!");
@@ -789,31 +759,28 @@ int libertas_process_rx_command(wlan_private * priv)
        }
 
        /* Store the response code to cur_cmd_retcode. */
-       adapter->cur_cmd_retcode = le16_to_cpu(resp->result);
+       adapter->cur_cmd_retcode = result;;
 
        if (respcmd == cmd_ret_802_11_ps_mode) {
-               struct cmd_ds_802_11_ps_mode *psmode;
+               struct cmd_ds_802_11_ps_mode *psmode = &resp->params.psmode;
+               u16 action = le16_to_cpu(psmode->action);
 
-               psmode = &resp->params.psmode;
                lbs_deb_cmd(
                       "CMD_RESP: PS_MODE cmd reply result=%#x action=0x%X\n",
-                      resp->result, psmode->action);
-               psmode->action = cpu_to_le16(psmode->action);
+                      result, action);
 
                if (result) {
                        lbs_deb_cmd("CMD_RESP: PS command failed- %#x \n",
-                              resp->result);
-                       if (adapter->mode == IW_MODE_ADHOC) {
-                               /*
-                                * We should not re-try enter-ps command in
-                                * ad-hoc mode. It takes place in
-                                * libertas_execute_next_command().
-                                */
-                               if (psmode->action == cmd_subcmd_enter_ps)
-                                       adapter->psmode =
-                                           wlan802_11powermodecam;
-                       }
-               } else if (psmode->action == cmd_subcmd_enter_ps) {
+                                   result);
+                       /*
+                        * We should not re-try enter-ps command in
+                        * ad-hoc mode. It takes place in
+                        * libertas_execute_next_command().
+                        */
+                       if (adapter->mode == IW_MODE_ADHOC &&
+                           action == cmd_subcmd_enter_ps)
+                               adapter->psmode = wlan802_11powermodecam;
+               } else if (action == cmd_subcmd_enter_ps) {
                        adapter->needtowakeup = 0;
                        adapter->psstate = PS_STATE_AWAKE;
 
@@ -832,13 +799,12 @@ int libertas_process_rx_command(wlan_private * priv)
                                mutex_lock(&adapter->lock);
                                spin_lock_irqsave(&adapter->driver_lock, flags);
                        }
-               } else if (psmode->action == cmd_subcmd_exit_ps) {
+               } else if (action == cmd_subcmd_exit_ps) {
                        adapter->needtowakeup = 0;
                        adapter->psstate = PS_STATE_FULL_POWER;
                        lbs_deb_cmd("CMD_RESP: Exit_PS command response\n");
                } else {
-                       lbs_deb_cmd("CMD_RESP: PS- action=0x%X\n",
-                              psmode->action);
+                       lbs_deb_cmd("CMD_RESP: PS- action=0x%X\n", action);
                }
 
                __libertas_cleanup_and_insert_cmd(priv, adapter->cur_cmd);
@@ -860,7 +826,7 @@ int libertas_process_rx_command(wlan_private * priv)
        /* If the command is not successful, cleanup and return failure */
        if ((result != 0 || !(respcmd & 0x8000))) {
                lbs_deb_cmd("CMD_RESP: command reply %#x result=%#x\n",
-                      resp->command, resp->result);
+                      respcmd, result);
                /*
                 * Handling errors here
                 */
index debefb6eab779943ea28c65ff301b8dde92cb771..b62ebca9ab6d1ce361d1306337b0a83bc8223327 100644 (file)
@@ -103,7 +103,6 @@ static ssize_t libertas_sleepparams_write(struct file *file,
        wlan_private *priv = file->private_data;
        ssize_t buf_size, res;
        int p1, p2, p3, p4, p5, p6;
-       struct sleep_params sp;
        unsigned long addr = get_zeroed_page(GFP_KERNEL);
        char *buf = (char *)addr;
 
@@ -117,14 +116,12 @@ static ssize_t libertas_sleepparams_write(struct file *file,
                res = -EFAULT;
                goto out_unlock;
        }
-       sp.sp_error = p1;
-       sp.sp_offset = p2;
-       sp.sp_stabletime = p3;
-       sp.sp_calcontrol = p4;
-       sp.sp_extsleepclk = p5;
-       sp.sp_reserved = p6;
-
-       memcpy(&priv->adapter->sp, &sp, sizeof(struct sleep_params));
+       priv->adapter->sp.sp_error = p1;
+       priv->adapter->sp.sp_offset = p2;
+       priv->adapter->sp.sp_stabletime = p3;
+       priv->adapter->sp.sp_calcontrol = p4;
+       priv->adapter->sp.sp_extsleepclk = p5;
+       priv->adapter->sp.sp_reserved = p6;
 
         res = libertas_prepare_and_send_command(priv,
                                cmd_802_11_sleep_params,
@@ -408,8 +405,8 @@ static int libertas_event_initcmd(wlan_private *priv, void **response_buf,
        (*cmdnode)->cmdflags |= CMD_F_HOSTCMD;
        (*cmdnode)->cmdwaitqwoken = 0;
        *cmd = (struct cmd_ds_command *)(*cmdnode)->bufvirtualaddr;
-       (*cmd)->command = cmd_802_11_subscribe_event;
-       (*cmd)->seqnum = ++priv->adapter->seqnum;
+       (*cmd)->command = cpu_to_le16(cmd_802_11_subscribe_event);
+       (*cmd)->seqnum = cpu_to_le16(++priv->adapter->seqnum);
        (*cmd)->result = 0;
        return 0;
 }
@@ -435,26 +432,25 @@ static ssize_t libertas_lowrssi_read(struct file *file, char __user *userbuf,
        }
 
        event = &pcmdptr->params.subscribe_event;
-       event->action = cmd_act_get;
-       pcmdptr->size =
-       cpu_to_le16(sizeof(struct cmd_ds_802_11_subscribe_event) + S_DS_GEN);
+       event->action = cpu_to_le16(cmd_act_get);
+       pcmdptr->size = cpu_to_le16(sizeof(*event) + S_DS_GEN);
        libertas_queue_cmd(adapter, pcmdnode, 1);
        wake_up_interruptible(&priv->mainthread.waitq);
 
        /* Sleep until response is generated by FW */
        wait_event_interruptible(pcmdnode->cmdwait_q,
-                               pcmdnode->cmdwaitqwoken);
+                                pcmdnode->cmdwaitqwoken);
 
        pcmdptr = response_buf;
        if (pcmdptr->result) {
-               lbs_pr_err("%s: fail, result=%d\n", __FUNCTION__,
-                       pcmdptr->result);
+               lbs_pr_err("%s: fail, result=%d\n", __func__,
+                          le16_to_cpu(pcmdptr->result));
                kfree(response_buf);
                free_page(addr);
                return 0;
        }
 
-       if (pcmdptr->command != cmd_ret_802_11_subscribe_event) {
+       if (pcmdptr->command != cpu_to_le16(cmd_ret_802_11_subscribe_event)) {
                lbs_pr_err("command response incorrect!\n");
                kfree(response_buf);
                free_page(addr);
@@ -462,17 +458,17 @@ static ssize_t libertas_lowrssi_read(struct file *file, char __user *userbuf,
        }
 
        cmd_len = S_DS_GEN + sizeof(struct cmd_ds_802_11_subscribe_event);
-       event = (struct cmd_ds_802_11_subscribe_event *)(response_buf + S_DS_GEN);
-       while (cmd_len < pcmdptr->size) {
-               struct mrvlietypesheader *header = (struct mrvlietypesheader *)(response_buf + cmd_len);
-               switch(header->type) {
+       event = (void *)(response_buf + S_DS_GEN);
+       while (cmd_len < le16_to_cpu(pcmdptr->size)) {
+               struct mrvlietypesheader *header = (void *)(response_buf + cmd_len);
+               switch (header->type) {
                struct mrvlietypes_rssithreshold  *Lowrssi;
-               case TLV_TYPE_RSSI_LOW:
-               Lowrssi = (struct mrvlietypes_rssithreshold *)(response_buf + cmd_len);
-               pos += snprintf(buf+pos, len-pos, "%d %d %d\n",
-                               Lowrssi->rssivalue,
-                               Lowrssi->rssifreq,
-                               (event->events & 0x0001)?1:0);
+               case __constant_cpu_to_le16(TLV_TYPE_RSSI_LOW):
+                       Lowrssi = (void *)(response_buf + cmd_len);
+                       pos += snprintf(buf+pos, len-pos, "%d %d %d\n",
+                                       Lowrssi->rssivalue,
+                                       Lowrssi->rssifreq,
+                                       (event->events & cpu_to_le16(0x0001))?1:0);
                default:
                        cmd_len += sizeof(struct mrvlietypes_snrthreshold);
                        break;
@@ -500,21 +496,20 @@ static u16 libertas_get_events_bitmap(wlan_private *priv)
                return res;
 
        event = &pcmdptr->params.subscribe_event;
-       event->action = cmd_act_get;
-       pcmdptr->size =
-       cpu_to_le16(sizeof(struct cmd_ds_802_11_subscribe_event) + S_DS_GEN);
+       event->action = cpu_to_le16(cmd_act_get);
+       pcmdptr->size = cpu_to_le16(sizeof(*event) + S_DS_GEN);
        libertas_queue_cmd(adapter, pcmdnode, 1);
        wake_up_interruptible(&priv->mainthread.waitq);
 
        /* Sleep until response is generated by FW */
        wait_event_interruptible(pcmdnode->cmdwait_q,
-                               pcmdnode->cmdwaitqwoken);
+                                pcmdnode->cmdwaitqwoken);
 
        pcmdptr = response_buf;
 
        if (pcmdptr->result) {
-               lbs_pr_err("%s: fail, result=%d\n", __FUNCTION__,
-                       pcmdptr->result);
+               lbs_pr_err("%s: fail, result=%d\n", __func__,
+                          le16_to_cpu(pcmdptr->result));
                kfree(response_buf);
                return 0;
        }
@@ -526,7 +521,7 @@ static u16 libertas_get_events_bitmap(wlan_private *priv)
        }
 
        event = (struct cmd_ds_802_11_subscribe_event *)(response_buf + S_DS_GEN);
-       event_bitmap = event->events;
+       event_bitmap = le16_to_cpu(event->events);
        kfree(response_buf);
        return event_bitmap;
 }
@@ -567,7 +562,7 @@ static ssize_t libertas_lowrssi_write(struct file *file,
                goto out_unlock;
 
        event = &pcmdptr->params.subscribe_event;
-       event->action = cmd_act_set;
+       event->action = cpu_to_le16(cmd_act_set);
        pcmdptr->size = cpu_to_le16(S_DS_GEN +
                sizeof(struct cmd_ds_802_11_subscribe_event) +
                sizeof(struct mrvlietypes_rssithreshold));
@@ -576,30 +571,30 @@ static ssize_t libertas_lowrssi_write(struct file *file,
        ptr = (u8*) pcmdptr+cmd_len;
        rssi_threshold = (struct mrvlietypes_rssithreshold *)(ptr);
        rssi_threshold->header.type = cpu_to_le16(0x0104);
-       rssi_threshold->header.len = 2;
-       rssi_threshold->rssivalue = cpu_to_le16(value);
-       rssi_threshold->rssifreq = cpu_to_le16(freq);
+       rssi_threshold->header.len = cpu_to_le16(2);
+       rssi_threshold->rssivalue = value;
+       rssi_threshold->rssifreq = freq;
        event_bitmap |= subscribed ? 0x0001 : 0x0;
-       event->events = event_bitmap;
+       event->events = cpu_to_le16(event_bitmap);
 
        libertas_queue_cmd(adapter, pcmdnode, 1);
        wake_up_interruptible(&priv->mainthread.waitq);
 
        /* Sleep until response is generated by FW */
        wait_event_interruptible(pcmdnode->cmdwait_q,
-                               pcmdnode->cmdwaitqwoken);
+                                pcmdnode->cmdwaitqwoken);
 
        pcmdptr = response_buf;
 
        if (pcmdptr->result) {
-               lbs_pr_err("%s: fail, result=%d\n", __FUNCTION__,
-                       pcmdptr->result);
+               lbs_pr_err("%s: fail, result=%d\n", __func__,
+                          le16_to_cpu(pcmdptr->result));
                kfree(response_buf);
                free_page(addr);
                return 0;
        }
 
-       if (pcmdptr->command != cmd_ret_802_11_subscribe_event) {
+       if (pcmdptr->command != cpu_to_le16(cmd_ret_802_11_subscribe_event)) {
                lbs_pr_err("command response incorrect!\n");
                kfree(response_buf);
                free_page(addr);
@@ -633,27 +628,26 @@ static ssize_t libertas_lowsnr_read(struct file *file, char __user *userbuf,
        }
 
        event = &pcmdptr->params.subscribe_event;
-       event->action = cmd_act_get;
-       pcmdptr->size =
-       cpu_to_le16(sizeof(struct cmd_ds_802_11_subscribe_event) + S_DS_GEN);
+       event->action = cpu_to_le16(cmd_act_get);
+       pcmdptr->size = cpu_to_le16(sizeof(*event) + S_DS_GEN);
        libertas_queue_cmd(adapter, pcmdnode, 1);
        wake_up_interruptible(&priv->mainthread.waitq);
 
        /* Sleep until response is generated by FW */
        wait_event_interruptible(pcmdnode->cmdwait_q,
-                               pcmdnode->cmdwaitqwoken);
+                                pcmdnode->cmdwaitqwoken);
 
        pcmdptr = response_buf;
 
        if (pcmdptr->result) {
-               lbs_pr_err("%s: fail, result=%d\n", __FUNCTION__,
-                       pcmdptr->result);
+               lbs_pr_err("%s: fail, result=%d\n", __func__,
+                          le16_to_cpu(pcmdptr->result));
                kfree(response_buf);
                free_page(addr);
                return 0;
        }
 
-       if (pcmdptr->command != cmd_ret_802_11_subscribe_event) {
+       if (pcmdptr->command != cpu_to_le16(cmd_ret_802_11_subscribe_event)) {
                lbs_pr_err("command response incorrect!\n");
                kfree(response_buf);
                free_page(addr);
@@ -661,17 +655,17 @@ static ssize_t libertas_lowsnr_read(struct file *file, char __user *userbuf,
        }
 
        cmd_len = S_DS_GEN + sizeof(struct cmd_ds_802_11_subscribe_event);
-       event = (struct cmd_ds_802_11_subscribe_event *)(response_buf + S_DS_GEN);
-       while (cmd_len < pcmdptr->size) {
-               struct mrvlietypesheader *header = (struct mrvlietypesheader *)(response_buf + cmd_len);
-               switch(header->type) {
+       event = (void *)(response_buf + S_DS_GEN);
+       while (cmd_len < le16_to_cpu(pcmdptr->size)) {
+               struct mrvlietypesheader *header = (void *)(response_buf + cmd_len);
+               switch (header->type) {
                struct mrvlietypes_snrthreshold *LowSnr;
-               case TLV_TYPE_SNR_LOW:
-               LowSnr = (struct mrvlietypes_snrthreshold *)(response_buf + cmd_len);
-               pos += snprintf(buf+pos, len-pos, "%d %d %d\n",
-                               LowSnr->snrvalue,
-                               LowSnr->snrfreq,
-                               (event->events & 0x0002)?1:0);
+               case __constant_cpu_to_le16(TLV_TYPE_SNR_LOW):
+                       LowSnr = (void *)(response_buf + cmd_len);
+                       pos += snprintf(buf+pos, len-pos, "%d %d %d\n",
+                                       LowSnr->snrvalue,
+                                       LowSnr->snrfreq,
+                                       (event->events & cpu_to_le16(0x0002))?1:0);
                default:
                        cmd_len += sizeof(struct mrvlietypes_snrthreshold);
                        break;
@@ -721,7 +715,7 @@ static ssize_t libertas_lowsnr_write(struct file *file,
                goto out_unlock;
 
        event = &pcmdptr->params.subscribe_event;
-       event->action = cmd_act_set;
+       event->action = cpu_to_le16(cmd_act_set);
        pcmdptr->size = cpu_to_le16(S_DS_GEN +
                sizeof(struct cmd_ds_802_11_subscribe_event) +
                sizeof(struct mrvlietypes_snrthreshold));
@@ -729,30 +723,30 @@ static ssize_t libertas_lowsnr_write(struct file *file,
        ptr = (u8*) pcmdptr+cmd_len;
        snr_threshold = (struct mrvlietypes_snrthreshold *)(ptr);
        snr_threshold->header.type = cpu_to_le16(TLV_TYPE_SNR_LOW);
-       snr_threshold->header.len = 2;
-       snr_threshold->snrvalue = cpu_to_le16(value);
-       snr_threshold->snrfreq = cpu_to_le16(freq);
+       snr_threshold->header.len = cpu_to_le16(2);
+       snr_threshold->snrvalue = value;
+       snr_threshold->snrfreq = freq;
        event_bitmap |= subscribed ? 0x0002 : 0x0;
-       event->events = event_bitmap;
+       event->events = cpu_to_le16(event_bitmap);
 
        libertas_queue_cmd(adapter, pcmdnode, 1);
        wake_up_interruptible(&priv->mainthread.waitq);
 
        /* Sleep until response is generated by FW */
        wait_event_interruptible(pcmdnode->cmdwait_q,
-                               pcmdnode->cmdwaitqwoken);
+                                pcmdnode->cmdwaitqwoken);
 
        pcmdptr = response_buf;
 
        if (pcmdptr->result) {
-               lbs_pr_err("%s: fail, result=%d\n", __FUNCTION__,
-                       pcmdptr->result);
+               lbs_pr_err("%s: fail, result=%d\n", __func__,
+                          le16_to_cpu(pcmdptr->result));
                kfree(response_buf);
                free_page(addr);
                return 0;
        }
 
-       if (pcmdptr->command != cmd_ret_802_11_subscribe_event) {
+       if (pcmdptr->command != cpu_to_le16(cmd_ret_802_11_subscribe_event)) {
                lbs_pr_err("command response incorrect!\n");
                kfree(response_buf);
                free_page(addr);
@@ -787,27 +781,26 @@ static ssize_t libertas_failcount_read(struct file *file, char __user *userbuf,
        }
 
        event = &pcmdptr->params.subscribe_event;
-       event->action = cmd_act_get;
-       pcmdptr->size =
-       cpu_to_le16(sizeof(struct cmd_ds_802_11_subscribe_event) + S_DS_GEN);
+       event->action = cpu_to_le16(cmd_act_get);
+       pcmdptr->size = cpu_to_le16(sizeof(*event) + S_DS_GEN);
        libertas_queue_cmd(adapter, pcmdnode, 1);
        wake_up_interruptible(&priv->mainthread.waitq);
 
        /* Sleep until response is generated by FW */
        wait_event_interruptible(pcmdnode->cmdwait_q,
-                               pcmdnode->cmdwaitqwoken);
+                                pcmdnode->cmdwaitqwoken);
 
        pcmdptr = response_buf;
 
        if (pcmdptr->result) {
-               lbs_pr_err("%s: fail, result=%d\n", __FUNCTION__,
-                       pcmdptr->result);
+               lbs_pr_err("%s: fail, result=%d\n", __func__,
+                          le16_to_cpu(pcmdptr->result));
                kfree(response_buf);
                free_page(addr);
                return 0;
        }
 
-       if (pcmdptr->command != cmd_ret_802_11_subscribe_event) {
+       if (pcmdptr->command != cpu_to_le16(cmd_ret_802_11_subscribe_event)) {
                lbs_pr_err("command response incorrect!\n");
                kfree(response_buf);
                free_page(addr);
@@ -815,17 +808,17 @@ static ssize_t libertas_failcount_read(struct file *file, char __user *userbuf,
        }
 
        cmd_len = S_DS_GEN + sizeof(struct cmd_ds_802_11_subscribe_event);
-       event = (struct cmd_ds_802_11_subscribe_event *)(response_buf + S_DS_GEN);
-       while (cmd_len < pcmdptr->size) {
-               struct mrvlietypesheader *header = (struct mrvlietypesheader *)(response_buf + cmd_len);
-               switch(header->type) {
+       event = (void *)(response_buf + S_DS_GEN);
+       while (cmd_len < le16_to_cpu(pcmdptr->size)) {
+               struct mrvlietypesheader *header = (void *)(response_buf + cmd_len);
+               switch (header->type) {
                struct mrvlietypes_failurecount *failcount;
-               case TLV_TYPE_FAILCOUNT:
-               failcount = (struct mrvlietypes_failurecount *)(response_buf + cmd_len);
-               pos += snprintf(buf+pos, len-pos, "%d %d %d\n",
-                               failcount->failvalue,
-                               failcount->Failfreq,
-                               (event->events & 0x0004)?1:0);
+               case __constant_cpu_to_le16(TLV_TYPE_FAILCOUNT):
+                       failcount = (void *)(response_buf + cmd_len);
+                       pos += snprintf(buf+pos, len-pos, "%d %d %d\n",
+                                       failcount->failvalue,
+                                       failcount->Failfreq,
+                                       (event->events & cpu_to_le16(0x0004))?1:0);
                default:
                        cmd_len += sizeof(struct mrvlietypes_failurecount);
                        break;
@@ -874,7 +867,7 @@ static ssize_t libertas_failcount_write(struct file *file,
                goto out_unlock;
 
        event = &pcmdptr->params.subscribe_event;
-       event->action = cmd_act_set;
+       event->action = cpu_to_le16(cmd_act_set);
        pcmdptr->size = cpu_to_le16(S_DS_GEN +
                sizeof(struct cmd_ds_802_11_subscribe_event) +
                sizeof(struct mrvlietypes_failurecount));
@@ -882,30 +875,30 @@ static ssize_t libertas_failcount_write(struct file *file,
        ptr = (u8*) pcmdptr+cmd_len;
        failcount = (struct mrvlietypes_failurecount *)(ptr);
        failcount->header.type = cpu_to_le16(TLV_TYPE_FAILCOUNT);
-       failcount->header.len = 2;
-       failcount->failvalue = cpu_to_le16(value);
-       failcount->Failfreq = cpu_to_le16(freq);
+       failcount->header.len = cpu_to_le16(2);
+       failcount->failvalue = value;
+       failcount->Failfreq = freq;
        event_bitmap |= subscribed ? 0x0004 : 0x0;
-       event->events = event_bitmap;
+       event->events = cpu_to_le16(event_bitmap);
 
        libertas_queue_cmd(adapter, pcmdnode, 1);
        wake_up_interruptible(&priv->mainthread.waitq);
 
        /* Sleep until response is generated by FW */
        wait_event_interruptible(pcmdnode->cmdwait_q,
-                               pcmdnode->cmdwaitqwoken);
+                                pcmdnode->cmdwaitqwoken);
 
        pcmdptr = (struct cmd_ds_command *)response_buf;
 
        if (pcmdptr->result) {
-               lbs_pr_err("%s: fail, result=%d\n", __FUNCTION__,
-                       pcmdptr->result);
+               lbs_pr_err("%s: fail, result=%d\n", __func__,
+                          le16_to_cpu(pcmdptr->result));
                kfree(response_buf);
                free_page(addr);
                return 0;
        }
 
-       if (pcmdptr->command != cmd_ret_802_11_subscribe_event) {
+       if (pcmdptr->command != cpu_to_le16(cmd_ret_802_11_subscribe_event)) {
                lbs_pr_err("command response incorrect!\n");
                kfree(response_buf);
                free_page(addr);
@@ -939,27 +932,26 @@ static ssize_t libertas_bcnmiss_read(struct file *file, char __user *userbuf,
        }
 
        event = &pcmdptr->params.subscribe_event;
-       event->action = cmd_act_get;
-       pcmdptr->size =
-       cpu_to_le16(sizeof(struct cmd_ds_802_11_subscribe_event) + S_DS_GEN);
+       event->action = cpu_to_le16(cmd_act_get);
+       pcmdptr->size = cpu_to_le16(sizeof(*event) + S_DS_GEN);
        libertas_queue_cmd(adapter, pcmdnode, 1);
        wake_up_interruptible(&priv->mainthread.waitq);
 
        /* Sleep until response is generated by FW */
        wait_event_interruptible(pcmdnode->cmdwait_q,
-                               pcmdnode->cmdwaitqwoken);
+                                pcmdnode->cmdwaitqwoken);
 
        pcmdptr = response_buf;
 
        if (pcmdptr->result) {
-               lbs_pr_err("%s: fail, result=%d\n", __FUNCTION__,
-                       pcmdptr->result);
+               lbs_pr_err("%s: fail, result=%d\n", __func__,
+                          le16_to_cpu(pcmdptr->result));
                free_page(addr);
                kfree(response_buf);
                return 0;
        }
 
-       if (pcmdptr->command != cmd_ret_802_11_subscribe_event) {
+       if (pcmdptr->command != cpu_to_le16(cmd_ret_802_11_subscribe_event)) {
                lbs_pr_err("command response incorrect!\n");
                free_page(addr);
                kfree(response_buf);
@@ -967,16 +959,16 @@ static ssize_t libertas_bcnmiss_read(struct file *file, char __user *userbuf,
        }
 
        cmd_len = S_DS_GEN + sizeof(struct cmd_ds_802_11_subscribe_event);
-       event = (struct cmd_ds_802_11_subscribe_event *)(response_buf + S_DS_GEN);
-       while (cmd_len < pcmdptr->size) {
-               struct mrvlietypesheader *header = (struct mrvlietypesheader *)(response_buf + cmd_len);
-               switch(header->type) {
+       event = (void *)(response_buf + S_DS_GEN);
+       while (cmd_len < le16_to_cpu(pcmdptr->size)) {
+               struct mrvlietypesheader *header = (void *)(response_buf + cmd_len);
+               switch (header->type) {
                struct mrvlietypes_beaconsmissed *bcnmiss;
-               case TLV_TYPE_BCNMISS:
-               bcnmiss = (struct mrvlietypes_beaconsmissed *)(response_buf + cmd_len);
-               pos += snprintf(buf+pos, len-pos, "%d N/A %d\n",
-                               bcnmiss->beaconmissed,
-                               (event->events & 0x0008)?1:0);
+               case __constant_cpu_to_le16(TLV_TYPE_BCNMISS):
+                       bcnmiss = (void *)(response_buf + cmd_len);
+                       pos += snprintf(buf+pos, len-pos, "%d N/A %d\n",
+                                       bcnmiss->beaconmissed,
+                                       (event->events & cpu_to_le16(0x0008))?1:0);
                default:
                        cmd_len += sizeof(struct mrvlietypes_beaconsmissed);
                        break;
@@ -1026,7 +1018,7 @@ static ssize_t libertas_bcnmiss_write(struct file *file,
                goto out_unlock;
 
        event = &pcmdptr->params.subscribe_event;
-       event->action = cmd_act_set;
+       event->action = cpu_to_le16(cmd_act_set);
        pcmdptr->size = cpu_to_le16(S_DS_GEN +
                sizeof(struct cmd_ds_802_11_subscribe_event) +
                sizeof(struct mrvlietypes_beaconsmissed));
@@ -1034,29 +1026,29 @@ static ssize_t libertas_bcnmiss_write(struct file *file,
        ptr = (u8*) pcmdptr+cmd_len;
        bcnmiss = (struct mrvlietypes_beaconsmissed *)(ptr);
        bcnmiss->header.type = cpu_to_le16(TLV_TYPE_BCNMISS);
-       bcnmiss->header.len = 2;
-       bcnmiss->beaconmissed = cpu_to_le16(value);
+       bcnmiss->header.len = cpu_to_le16(2);
+       bcnmiss->beaconmissed = value;
        event_bitmap |= subscribed ? 0x0008 : 0x0;
-       event->events = event_bitmap;
+       event->events = cpu_to_le16(event_bitmap);
 
        libertas_queue_cmd(adapter, pcmdnode, 1);
        wake_up_interruptible(&priv->mainthread.waitq);
 
        /* Sleep until response is generated by FW */
        wait_event_interruptible(pcmdnode->cmdwait_q,
-                               pcmdnode->cmdwaitqwoken);
+                                pcmdnode->cmdwaitqwoken);
 
        pcmdptr = response_buf;
 
        if (pcmdptr->result) {
-               lbs_pr_err("%s: fail, result=%d\n", __FUNCTION__,
-                       pcmdptr->result);
+               lbs_pr_err("%s: fail, result=%d\n", __func__,
+                          le16_to_cpu(pcmdptr->result));
                kfree(response_buf);
                free_page(addr);
                return 0;
        }
 
-       if (pcmdptr->command != cmd_ret_802_11_subscribe_event) {
+       if (pcmdptr->command != cpu_to_le16(cmd_ret_802_11_subscribe_event)) {
                lbs_pr_err("command response incorrect!\n");
                free_page(addr);
                kfree(response_buf);
@@ -1090,27 +1082,26 @@ static ssize_t libertas_highrssi_read(struct file *file, char __user *userbuf,
        }
 
        event = &pcmdptr->params.subscribe_event;
-       event->action = cmd_act_get;
-       pcmdptr->size =
-       cpu_to_le16(sizeof(struct cmd_ds_802_11_subscribe_event) + S_DS_GEN);
+       event->action = cpu_to_le16(cmd_act_get);
+       pcmdptr->size = cpu_to_le16(sizeof(*event) + S_DS_GEN);
        libertas_queue_cmd(adapter, pcmdnode, 1);
        wake_up_interruptible(&priv->mainthread.waitq);
 
        /* Sleep until response is generated by FW */
        wait_event_interruptible(pcmdnode->cmdwait_q,
-                               pcmdnode->cmdwaitqwoken);
+                                pcmdnode->cmdwaitqwoken);
 
        pcmdptr = response_buf;
 
        if (pcmdptr->result) {
-               lbs_pr_err("%s: fail, result=%d\n", __FUNCTION__,
-                       pcmdptr->result);
+               lbs_pr_err("%s: fail, result=%d\n", __func__,
+                          le16_to_cpu(pcmdptr->result));
                kfree(response_buf);
                free_page(addr);
                return 0;
        }
 
-       if (pcmdptr->command != cmd_ret_802_11_subscribe_event) {
+       if (pcmdptr->command != cpu_to_le16(cmd_ret_802_11_subscribe_event)) {
                lbs_pr_err("command response incorrect!\n");
                kfree(response_buf);
                free_page(addr);
@@ -1118,17 +1109,17 @@ static ssize_t libertas_highrssi_read(struct file *file, char __user *userbuf,
        }
 
        cmd_len = S_DS_GEN + sizeof(struct cmd_ds_802_11_subscribe_event);
-       event = (struct cmd_ds_802_11_subscribe_event *)(response_buf + S_DS_GEN);
-       while (cmd_len < pcmdptr->size) {
-               struct mrvlietypesheader *header = (struct mrvlietypesheader *)(response_buf + cmd_len);
-               switch(header->type) {
+       event = (void *)(response_buf + S_DS_GEN);
+       while (cmd_len < le16_to_cpu(pcmdptr->size)) {
+               struct mrvlietypesheader *header = (void *)(response_buf + cmd_len);
+               switch (header->type) {
                struct mrvlietypes_rssithreshold  *Highrssi;
-               case TLV_TYPE_RSSI_HIGH:
-               Highrssi = (struct mrvlietypes_rssithreshold *)(response_buf + cmd_len);
-               pos += snprintf(buf+pos, len-pos, "%d %d %d\n",
-                               Highrssi->rssivalue,
-                               Highrssi->rssifreq,
-                               (event->events & 0x0010)?1:0);
+               case __constant_cpu_to_le16(TLV_TYPE_RSSI_HIGH):
+                       Highrssi = (void *)(response_buf + cmd_len);
+                       pos += snprintf(buf+pos, len-pos, "%d %d %d\n",
+                                       Highrssi->rssivalue,
+                                       Highrssi->rssifreq,
+                                       (event->events & cpu_to_le16(0x0010))?1:0);
                default:
                        cmd_len += sizeof(struct mrvlietypes_snrthreshold);
                        break;
@@ -1178,7 +1169,7 @@ static ssize_t libertas_highrssi_write(struct file *file,
                goto out_unlock;
 
        event = &pcmdptr->params.subscribe_event;
-       event->action = cmd_act_set;
+       event->action = cpu_to_le16(cmd_act_set);
        pcmdptr->size = cpu_to_le16(S_DS_GEN +
                sizeof(struct cmd_ds_802_11_subscribe_event) +
                sizeof(struct mrvlietypes_rssithreshold));
@@ -1186,29 +1177,29 @@ static ssize_t libertas_highrssi_write(struct file *file,
        ptr = (u8*) pcmdptr+cmd_len;
        rssi_threshold = (struct mrvlietypes_rssithreshold *)(ptr);
        rssi_threshold->header.type = cpu_to_le16(TLV_TYPE_RSSI_HIGH);
-       rssi_threshold->header.len = 2;
-       rssi_threshold->rssivalue = cpu_to_le16(value);
-       rssi_threshold->rssifreq = cpu_to_le16(freq);
+       rssi_threshold->header.len = cpu_to_le16(2);
+       rssi_threshold->rssivalue = value;
+       rssi_threshold->rssifreq = freq;
        event_bitmap |= subscribed ? 0x0010 : 0x0;
-       event->events = event_bitmap;
+       event->events = cpu_to_le16(event_bitmap);
 
        libertas_queue_cmd(adapter, pcmdnode, 1);
        wake_up_interruptible(&priv->mainthread.waitq);
 
        /* Sleep until response is generated by FW */
        wait_event_interruptible(pcmdnode->cmdwait_q,
-                               pcmdnode->cmdwaitqwoken);
+                                pcmdnode->cmdwaitqwoken);
 
        pcmdptr = response_buf;
 
        if (pcmdptr->result) {
-               lbs_pr_err("%s: fail, result=%d\n", __FUNCTION__,
-                       pcmdptr->result);
+               lbs_pr_err("%s: fail, result=%d\n", __func__,
+                          le16_to_cpu(pcmdptr->result));
                kfree(response_buf);
                return 0;
        }
 
-       if (pcmdptr->command != cmd_ret_802_11_subscribe_event) {
+       if (pcmdptr->command != cpu_to_le16(cmd_ret_802_11_subscribe_event)) {
                lbs_pr_err("command response incorrect!\n");
                kfree(response_buf);
                return 0;
@@ -1241,27 +1232,26 @@ static ssize_t libertas_highsnr_read(struct file *file, char __user *userbuf,
        }
 
        event = &pcmdptr->params.subscribe_event;
-       event->action = cmd_act_get;
-       pcmdptr->size =
-       cpu_to_le16(sizeof(struct cmd_ds_802_11_subscribe_event) + S_DS_GEN);
+       event->action = cpu_to_le16(cmd_act_get);
+       pcmdptr->size = cpu_to_le16(sizeof(*event) + S_DS_GEN);
        libertas_queue_cmd(adapter, pcmdnode, 1);
        wake_up_interruptible(&priv->mainthread.waitq);
 
        /* Sleep until response is generated by FW */
        wait_event_interruptible(pcmdnode->cmdwait_q,
-                               pcmdnode->cmdwaitqwoken);
+                                pcmdnode->cmdwaitqwoken);
 
        pcmdptr = response_buf;
 
        if (pcmdptr->result) {
-               lbs_pr_err("%s: fail, result=%d\n", __FUNCTION__,
-                       pcmdptr->result);
+               lbs_pr_err("%s: fail, result=%d\n", __func__,
+                          le16_to_cpu(pcmdptr->result));
                kfree(response_buf);
                free_page(addr);
                return 0;
        }
 
-       if (pcmdptr->command != cmd_ret_802_11_subscribe_event) {
+       if (pcmdptr->command != cpu_to_le16(cmd_ret_802_11_subscribe_event)) {
                lbs_pr_err("command response incorrect!\n");
                kfree(response_buf);
                free_page(addr);
@@ -1269,17 +1259,17 @@ static ssize_t libertas_highsnr_read(struct file *file, char __user *userbuf,
        }
 
        cmd_len = S_DS_GEN + sizeof(struct cmd_ds_802_11_subscribe_event);
-       event = (struct cmd_ds_802_11_subscribe_event *)(response_buf + S_DS_GEN);
-       while (cmd_len < pcmdptr->size) {
-               struct mrvlietypesheader *header = (struct mrvlietypesheader *)(response_buf + cmd_len);
-               switch(header->type) {
+       event = (void *)(response_buf + S_DS_GEN);
+       while (cmd_len < le16_to_cpu(pcmdptr->size)) {
+               struct mrvlietypesheader *header = (void *)(response_buf + cmd_len);
+               switch (header->type) {
                struct mrvlietypes_snrthreshold *HighSnr;
-               case TLV_TYPE_SNR_HIGH:
-               HighSnr = (struct mrvlietypes_snrthreshold *)(response_buf + cmd_len);
-               pos += snprintf(buf+pos, len-pos, "%d %d %d\n",
-                               HighSnr->snrvalue,
-                               HighSnr->snrfreq,
-                               (event->events & 0x0020)?1:0);
+               case __constant_cpu_to_le16(TLV_TYPE_SNR_HIGH):
+                       HighSnr = (void *)(response_buf + cmd_len);
+                       pos += snprintf(buf+pos, len-pos, "%d %d %d\n",
+                                       HighSnr->snrvalue,
+                                       HighSnr->snrfreq,
+                                       (event->events & cpu_to_le16(0x0020))?1:0);
                default:
                        cmd_len += sizeof(struct mrvlietypes_snrthreshold);
                        break;
@@ -1329,7 +1319,7 @@ static ssize_t libertas_highsnr_write(struct file *file,
                goto out_unlock;
 
        event = &pcmdptr->params.subscribe_event;
-       event->action = cmd_act_set;
+       event->action = cpu_to_le16(cmd_act_set);
        pcmdptr->size = cpu_to_le16(S_DS_GEN +
                sizeof(struct cmd_ds_802_11_subscribe_event) +
                sizeof(struct mrvlietypes_snrthreshold));
@@ -1337,30 +1327,30 @@ static ssize_t libertas_highsnr_write(struct file *file,
        ptr = (u8*) pcmdptr+cmd_len;
        snr_threshold = (struct mrvlietypes_snrthreshold *)(ptr);
        snr_threshold->header.type = cpu_to_le16(TLV_TYPE_SNR_HIGH);
-       snr_threshold->header.len = 2;
-       snr_threshold->snrvalue = cpu_to_le16(value);
-       snr_threshold->snrfreq = cpu_to_le16(freq);
+       snr_threshold->header.len = cpu_to_le16(2);
+       snr_threshold->snrvalue = value;
+       snr_threshold->snrfreq = freq;
        event_bitmap |= subscribed ? 0x0020 : 0x0;
-       event->events = event_bitmap;
+       event->events = cpu_to_le16(event_bitmap);
 
        libertas_queue_cmd(adapter, pcmdnode, 1);
        wake_up_interruptible(&priv->mainthread.waitq);
 
        /* Sleep until response is generated by FW */
        wait_event_interruptible(pcmdnode->cmdwait_q,
-                               pcmdnode->cmdwaitqwoken);
+                                pcmdnode->cmdwaitqwoken);
 
        pcmdptr = response_buf;
 
        if (pcmdptr->result) {
-               lbs_pr_err("%s: fail, result=%d\n", __FUNCTION__,
-                       pcmdptr->result);
+               lbs_pr_err("%s: fail, result=%d\n", __func__,
+                          le16_to_cpu(pcmdptr->result));
                kfree(response_buf);
                free_page(addr);
                return 0;
        }
 
-       if (pcmdptr->command != cmd_ret_802_11_subscribe_event) {
+       if (pcmdptr->command != cpu_to_le16(cmd_ret_802_11_subscribe_event)) {
                lbs_pr_err("command response incorrect!\n");
                kfree(response_buf);
                free_page(addr);
index 2be1815e2878c682b9732c40c9f5659082036edf..96f1974685d4f4662fd88bbd185edf359daaf626 100644 (file)
@@ -146,14 +146,14 @@ static int libertas_ethtool_get_stats_count(struct net_device * dev)
                goto done;
        }
 
-        priv->mstats.fwd_drop_rbt = mesh_access.data[0];
-        priv->mstats.fwd_drop_ttl = mesh_access.data[1];
-        priv->mstats.fwd_drop_noroute = mesh_access.data[2];
-        priv->mstats.fwd_drop_nobuf = mesh_access.data[3];
-        priv->mstats.fwd_unicast_cnt = mesh_access.data[4];
-        priv->mstats.fwd_bcast_cnt = mesh_access.data[5];
-        priv->mstats.drop_blind = mesh_access.data[6];
-        priv->mstats.tx_failed_cnt = mesh_access.data[7];
+        priv->mstats.fwd_drop_rbt = le32_to_cpu(mesh_access.data[0]);
+        priv->mstats.fwd_drop_ttl = le32_to_cpu(mesh_access.data[1]);
+        priv->mstats.fwd_drop_noroute = le32_to_cpu(mesh_access.data[2]);
+        priv->mstats.fwd_drop_nobuf = le32_to_cpu(mesh_access.data[3]);
+        priv->mstats.fwd_unicast_cnt = le32_to_cpu(mesh_access.data[4]);
+        priv->mstats.fwd_bcast_cnt = le32_to_cpu(mesh_access.data[5]);
+        priv->mstats.drop_blind = le32_to_cpu(mesh_access.data[6]);
+        priv->mstats.tx_failed_cnt = le32_to_cpu(mesh_access.data[7]);
 
        ret = MESH_STATS_NUM;
 
index 5463ee618a19c5c2b24c799091c6f245db4c9c03..2dc84ff7a54ac4b574f6c82915d187abaf37deaf 100644 (file)
@@ -19,7 +19,7 @@
  */
 static int check_fwfile_format(u8 *data, u32 totlen)
 {
-       u bincmd, exit;
+       u32 bincmd, exit;
        u32 blksize, offset, len;
        int ret;
 
@@ -27,8 +27,10 @@ static int check_fwfile_format(u8 *data, u32 totlen)
        exit = len = 0;
 
        do {
-               bincmd = *data;
-               blksize = *(u32*)(data + offsetof(struct fwheader, datalength));
+               struct fwheader *fwh = (void *)data;
+
+               bincmd = le32_to_cpu(fwh->dnldcmd);
+               blksize = le32_to_cpu(fwh->datalength);
                switch (bincmd) {
                case FW_HAS_DATA_TO_RECV:
                        offset = sizeof(struct fwheader) + blksize;
@@ -72,13 +74,12 @@ static int wlan_setup_station_hw(wlan_private * priv, char *fw_name)
 
        if ((ret = request_firmware(&priv->firmware, fw_name,
                                    priv->hotplug_device)) < 0) {
-               lbs_pr_err("request_firmware() failed with %#x\n",
-                      ret);
+               lbs_pr_err("request_firmware() failed with %#x\n", ret);
                lbs_pr_err("firmware %s not found\n", fw_name);
                goto done;
        }
 
-       if(check_fwfile_format(priv->firmware->data, priv->firmware->size)) {
+       if (check_fwfile_format(priv->firmware->data, priv->firmware->size)) {
                release_firmware(priv->firmware);
                goto done;
        }
index 581b9a37d7b7f4b0960510b212ebeb52dc059509..204d9d53aba85fd0bff57d99c3f9bfd1a8ca8217 100644 (file)
 /* TxPD descriptor */
 struct txpd {
        /* Current Tx packet status */
-       u32 tx_status;
+       __le32 tx_status;
        /* Tx control */
-       u32 tx_control;
-       u32 tx_packet_location;
+       __le32 tx_control;
+       __le32 tx_packet_location;
        /* Tx packet length */
-       u16 tx_packet_length;
+       __le16 tx_packet_length;
        /* First 2 byte of destination MAC address */
        u8 tx_dest_addr_high[2];
        /* Last 4 byte of destination MAC address */
@@ -37,7 +37,7 @@ struct txpd {
 /* RxPD Descriptor */
 struct rxpd {
        /* Current Rx packet status */
-       u16 status;
+       __le16 status;
 
        /* SNR */
        u8 snr;
@@ -46,7 +46,7 @@ struct rxpd {
        u8 rx_control;
 
        /* Pkt length */
-       u16 pkt_len;
+       __le16 pkt_len;
 
        /* Noise Floor */
        u8 nf;
@@ -55,10 +55,10 @@ struct rxpd {
        u8 rx_rate;
 
        /* Pkt addr */
-       u32 pkt_ptr;
+       __le32 pkt_ptr;
 
        /* Next Rx RxPD addr */
-       u32 next_rxpd_ptr;
+       __le32 next_rxpd_ptr;
 
        /* Pkt Priority */
        u8 priority;
@@ -89,22 +89,22 @@ struct cmd_ctrl_node {
  * is determined from the keylength field.
  */
 struct WLAN_802_11_KEY {
-       u32 len;
-       u32 flags;  /* KEY_INFO_* from wlan_defs.h */
+       __le32 len;
+       __le32 flags;  /* KEY_INFO_* from wlan_defs.h */
        u8 key[MRVL_MAX_KEY_WPA_KEY_LENGTH];
-       u16 type; /* KEY_TYPE_* from wlan_defs.h */
+       __le16 type; /* KEY_TYPE_* from wlan_defs.h */
 };
 
 struct IE_WPA {
        u8 elementid;
        u8 len;
        u8 oui[4];
-       u16 version;
+       __le16 version;
 };
 
 struct WLAN_802_11_SSID {
        /* SSID length */
-       u32 ssidlength;
+       __le32 ssidlength;
 
        /* SSID information field */
        u8 ssid[IW_ESSID_MAX_SIZE];
@@ -122,9 +122,9 @@ struct wlan_offset_value {
 };
 
 struct WLAN_802_11_FIXED_IEs {
-       u8 timestamp[8];
-       u16 beaconinterval;
-       u16 capabilities;
+       __le64 timestamp;
+       __le16 beaconinterval;
+       u16 capabilities; /* Actually struct ieeetypes_capinfo */
 };
 
 struct WLAN_802_11_VARIABLE_IEs {
@@ -136,10 +136,10 @@ struct WLAN_802_11_VARIABLE_IEs {
 /* Define general data structure */
 /* cmd_DS_GEN */
 struct cmd_ds_gen {
-       u16 command;
-       u16 size;
-       u16 seqnum;
-       u16 result;
+       __le16 command;
+       __le16 size;
+       __le16 seqnum;
+       __le16 result;
 };
 
 #define S_DS_GEN sizeof(struct cmd_ds_gen)
@@ -149,44 +149,44 @@ struct cmd_ds_gen {
  */
 struct cmd_ds_get_hw_spec {
        /* HW Interface version number */
-       u16 hwifversion;
+       __le16 hwifversion;
        /* HW version number */
-       u16 version;
+       __le16 version;
        /* Max number of TxPD FW can handle */
-       u16 nr_txpd;
+       __le16 nr_txpd;
        /* Max no of Multicast address */
-       u16 nr_mcast_adr;
+       __le16 nr_mcast_adr;
        /* MAC address */
        u8 permanentaddr[6];
 
        /* region Code */
-       u16 regioncode;
+       __le16 regioncode;
 
        /* Number of antenna used */
-       u16 nr_antenna;
+       __le16 nr_antenna;
 
        /* FW release number, example 0x1234=1.2.3.4 */
-       u32 fwreleasenumber;
+       __le32 fwreleasenumber;
 
        /* Base Address of TxPD queue */
-       u32 wcb_base;
+       __le32 wcb_base;
        /* Read Pointer of RxPd queue */
-       u32 rxpd_rdptr;
+       __le32 rxpd_rdptr;
 
        /* Write Pointer of RxPd queue */
-       u32 rxpd_wrptr;
+       __le32 rxpd_wrptr;
 
        /*FW/HW capability */
-       u32 fwcapinfo;
+       __le32 fwcapinfo;
 } __attribute__ ((packed));
 
 struct cmd_ds_802_11_reset {
-       u16 action;
+       __le16 action;
 };
 
 struct cmd_ds_802_11_subscribe_event {
-       u16 action;
-       u16 events;
+       __le16 action;
+       __le16 events;
 };
 
 /*
@@ -205,35 +205,35 @@ struct cmd_ds_802_11_scan {
 };
 
 struct cmd_ds_802_11_scan_rsp {
-       u16 bssdescriptsize;
+       __le16 bssdescriptsize;
        u8 nr_sets;
        u8 bssdesc_and_tlvbuffer[1];
 };
 
 struct cmd_ds_802_11_get_log {
-       u32 mcasttxframe;
-       u32 failed;
-       u32 retry;
-       u32 multiretry;
-       u32 framedup;
-       u32 rtssuccess;
-       u32 rtsfailure;
-       u32 ackfailure;
-       u32 rxfrag;
-       u32 mcastrxframe;
-       u32 fcserror;
-       u32 txframe;
-       u32 wepundecryptable;
+       __le32 mcasttxframe;
+       __le32 failed;
+       __le32 retry;
+       __le32 multiretry;
+       __le32 framedup;
+       __le32 rtssuccess;
+       __le32 rtsfailure;
+       __le32 ackfailure;
+       __le32 rxfrag;
+       __le32 mcastrxframe;
+       __le32 fcserror;
+       __le32 txframe;
+       __le32 wepundecryptable;
 };
 
 struct cmd_ds_mac_control {
-       u16 action;
-       u16 reserved;
+       __le16 action;
+       __le16 reserved;
 };
 
 struct cmd_ds_mac_multicast_adr {
-       u16 action;
-       u16 nr_of_adrs;
+       __le16 action;
+       __le16 nr_of_adrs;
        u8 maclist[ETH_ALEN * MRVDRV_MAX_MULTICAST_LIST_SIZE];
 };
 
@@ -245,14 +245,14 @@ struct cmd_ds_802_11_authenticate {
 
 struct cmd_ds_802_11_deauthenticate {
        u8 macaddr[6];
-       u16 reasoncode;
+       __le16 reasoncode;
 };
 
 struct cmd_ds_802_11_associate {
        u8 peerstaaddr[6];
        struct ieeetypes_capinfo capinfo;
-       u16 listeninterval;
-       u16 bcnperiod;
+       __le16 listeninterval;
+       __le16 bcnperiod;
        u8 dtimperiod;
 
 #if 0
@@ -265,7 +265,7 @@ struct cmd_ds_802_11_associate {
 
 struct cmd_ds_802_11_disassociate {
        u8 destmacaddr[6];
-       u16 reasoncode;
+       __le16 reasoncode;
 };
 
 struct cmd_ds_802_11_associate_rsp {
@@ -279,10 +279,10 @@ struct cmd_ds_802_11_ad_hoc_result {
 
 struct cmd_ds_802_11_set_wep {
        /* ACT_ADD, ACT_REMOVE or ACT_ENABLE */
-       u16 action;
+       __le16 action;
 
        /* key Index selected for Tx */
-       u16 keyindex;
+       __le16 keyindex;
 
        /* 40, 128bit or TXWEP */
        u8 keytype[4];
@@ -290,96 +290,96 @@ struct cmd_ds_802_11_set_wep {
 };
 
 struct cmd_ds_802_3_get_stat {
-       u32 xmitok;
-       u32 rcvok;
-       u32 xmiterror;
-       u32 rcverror;
-       u32 rcvnobuffer;
-       u32 rcvcrcerror;
+       __le32 xmitok;
+       __le32 rcvok;
+       __le32 xmiterror;
+       __le32 rcverror;
+       __le32 rcvnobuffer;
+       __le32 rcvcrcerror;
 };
 
 struct cmd_ds_802_11_get_stat {
-       u32 txfragmentcnt;
-       u32 mcasttxframecnt;
-       u32 failedcnt;
-       u32 retrycnt;
-       u32 Multipleretrycnt;
-       u32 rtssuccesscnt;
-       u32 rtsfailurecnt;
-       u32 ackfailurecnt;
-       u32 frameduplicatecnt;
-       u32 rxfragmentcnt;
-       u32 mcastrxframecnt;
-       u32 fcserrorcnt;
-       u32 bcasttxframecnt;
-       u32 bcastrxframecnt;
-       u32 txbeacon;
-       u32 rxbeacon;
-       u32 wepundecryptable;
+       __le32 txfragmentcnt;
+       __le32 mcasttxframecnt;
+       __le32 failedcnt;
+       __le32 retrycnt;
+       __le32 Multipleretrycnt;
+       __le32 rtssuccesscnt;
+       __le32 rtsfailurecnt;
+       __le32 ackfailurecnt;
+       __le32 frameduplicatecnt;
+       __le32 rxfragmentcnt;
+       __le32 mcastrxframecnt;
+       __le32 fcserrorcnt;
+       __le32 bcasttxframecnt;
+       __le32 bcastrxframecnt;
+       __le32 txbeacon;
+       __le32 rxbeacon;
+       __le32 wepundecryptable;
 };
 
 struct cmd_ds_802_11_snmp_mib {
-       u16 querytype;
-       u16 oid;
-       u16 bufsize;
+       __le16 querytype;
+       __le16 oid;
+       __le16 bufsize;
        u8 value[128];
 };
 
 struct cmd_ds_mac_reg_map {
-       u16 buffersize;
+       __le16 buffersize;
        u8 regmap[128];
-       u16 reserved;
+       __le16 reserved;
 };
 
 struct cmd_ds_bbp_reg_map {
-       u16 buffersize;
+       __le16 buffersize;
        u8 regmap[128];
-       u16 reserved;
+       __le16 reserved;
 };
 
 struct cmd_ds_rf_reg_map {
-       u16 buffersize;
+       __le16 buffersize;
        u8 regmap[64];
-       u16 reserved;
+       __le16 reserved;
 };
 
 struct cmd_ds_mac_reg_access {
-       u16 action;
-       u16 offset;
-       u32 value;
+       __le16 action;
+       __le16 offset;
+       __le32 value;
 };
 
 struct cmd_ds_bbp_reg_access {
-       u16 action;
-       u16 offset;
+       __le16 action;
+       __le16 offset;
        u8 value;
        u8 reserved[3];
 };
 
 struct cmd_ds_rf_reg_access {
-       u16 action;
-       u16 offset;
+       __le16 action;
+       __le16 offset;
        u8 value;
        u8 reserved[3];
 };
 
 struct cmd_ds_802_11_radio_control {
-       u16 action;
-       u16 control;
+       __le16 action;
+       __le16 control;
 };
 
 struct cmd_ds_802_11_sleep_params {
        /* ACT_GET/ACT_SET */
-       u16 action;
+       __le16 action;
 
        /* Sleep clock error in ppm */
-       u16 error;
+       __le16 error;
 
        /* Wakeup offset in usec */
-       u16 offset;
+       __le16 offset;
 
        /* Clock stabilization time in usec */
-       u16 stabletime;
+       __le16 stabletime;
 
        /* control periodic calibration */
        u8 calcontrol;
@@ -388,100 +388,100 @@ struct cmd_ds_802_11_sleep_params {
        u8 externalsleepclk;
 
        /* reserved field, should be set to zero */
-       u16 reserved;
+       __le16 reserved;
 };
 
 struct cmd_ds_802_11_inactivity_timeout {
        /* ACT_GET/ACT_SET */
-       u16 action;
+       __le16 action;
 
        /* Inactivity timeout in msec */
-       u16 timeout;
+       __le16 timeout;
 };
 
 struct cmd_ds_802_11_rf_channel {
-       u16 action;
-       u16 currentchannel;
-       u16 rftype;
-       u16 reserved;
+       __le16 action;
+       __le16 currentchannel;
+       __le16 rftype;
+       __le16 reserved;
        u8 channellist[32];
 };
 
 struct cmd_ds_802_11_rssi {
        /* weighting factor */
-       u16 N;
+       __le16 N;
 
-       u16 reserved_0;
-       u16 reserved_1;
-       u16 reserved_2;
+       __le16 reserved_0;
+       __le16 reserved_1;
+       __le16 reserved_2;
 };
 
 struct cmd_ds_802_11_rssi_rsp {
-       u16 SNR;
-       u16 noisefloor;
-       u16 avgSNR;
-       u16 avgnoisefloor;
+       __le16 SNR;
+       __le16 noisefloor;
+       __le16 avgSNR;
+       __le16 avgnoisefloor;
 };
 
 struct cmd_ds_802_11_mac_address {
-       u16 action;
+       __le16 action;
        u8 macadd[ETH_ALEN];
 };
 
 struct cmd_ds_802_11_rf_tx_power {
-       u16 action;
-       u16 currentlevel;
+       __le16 action;
+       __le16 currentlevel;
 };
 
 struct cmd_ds_802_11_rf_antenna {
-       u16 action;
+       __le16 action;
 
        /* Number of antennas or 0xffff(diversity) */
-       u16 antennamode;
+       __le16 antennamode;
 
 };
 
 struct cmd_ds_802_11_ps_mode {
-       u16 action;
-       u16 nullpktinterval;
-       u16 multipledtim;
-       u16 reserved;
-       u16 locallisteninterval;
+       __le16 action;
+       __le16 nullpktinterval;
+       __le16 multipledtim;
+       __le16 reserved;
+       __le16 locallisteninterval;
 };
 
 struct PS_CMD_ConfirmSleep {
-       u16 command;
-       u16 size;
-       u16 seqnum;
-       u16 result;
+       __le16 command;
+       __le16 size;
+       __le16 seqnum;
+       __le16 result;
 
-       u16 action;
-       u16 reserved1;
-       u16 multipledtim;
-       u16 reserved;
-       u16 locallisteninterval;
+       __le16 action;
+       __le16 reserved1;
+       __le16 multipledtim;
+       __le16 reserved;
+       __le16 locallisteninterval;
 };
 
 struct cmd_ds_802_11_data_rate {
-       u16 action;
-       u16 reserverd;
+       __le16 action;
+       __le16 reserverd;
        u8 datarate[G_SUPPORTED_RATES];
 };
 
 struct cmd_ds_802_11_rate_adapt_rateset {
-       u16 action;
-       u16 enablehwauto;
-       u16 bitmap;
+       __le16 action;
+       __le16 enablehwauto;
+       __le16 bitmap;
 };
 
 struct cmd_ds_802_11_ad_hoc_start {
        u8 SSID[IW_ESSID_MAX_SIZE];
        u8 bsstype;
-       u16 beaconperiod;
+       __le16 beaconperiod;
        u8 dtimperiod;
        union IEEEtypes_ssparamset ssparamset;
        union ieeetypes_phyparamset phyparamset;
-       u16 probedelay;
+       __le16 probedelay;
        struct ieeetypes_capinfo cap;
        u8 datarate[G_SUPPORTED_RATES];
        u8 tlv_memory_size_pad[100];
@@ -491,10 +491,10 @@ struct adhoc_bssdesc {
        u8 BSSID[6];
        u8 SSID[32];
        u8 bsstype;
-       u16 beaconperiod;
+       __le16 beaconperiod;
        u8 dtimperiod;
-       u8 timestamp[8];
-       u8 localtime[8];
+       __le64 timestamp;
+       __le64 localtime;
        union ieeetypes_phyparamset phyparamset;
        union IEEEtypes_ssparamset ssparamset;
        struct ieeetypes_capinfo cap;
@@ -508,52 +508,52 @@ struct adhoc_bssdesc {
 
 struct cmd_ds_802_11_ad_hoc_join {
        struct adhoc_bssdesc bssdescriptor;
-       u16 failtimeout;
-       u16 probedelay;
+       __le16 failtimeout;
+       __le16 probedelay;
 
 } __attribute__ ((packed));
 
 struct cmd_ds_802_11_enable_rsn {
-       u16 action;
-       u16 enable;
+       __le16 action;
+       __le16 enable;
 };
 
 struct MrvlIEtype_keyParamSet {
        /* type ID */
-       u16 type;
+       __le16 type;
 
        /* length of Payload */
-       u16 length;
+       __le16 length;
 
        /* type of key: WEP=0, TKIP=1, AES=2 */
-       u16 keytypeid;
+       __le16 keytypeid;
 
        /* key control Info specific to a keytypeid */
-       u16 keyinfo;
+       __le16 keyinfo;
 
        /* length of key */
-       u16 keylen;
+       __le16 keylen;
 
        /* key material of size keylen */
        u8 key[32];
 };
 
 struct cmd_ds_802_11_key_material {
-       u16 action;
+       __le16 action;
        struct MrvlIEtype_keyParamSet keyParamSet[2];
 } __attribute__ ((packed));
 
 struct cmd_ds_802_11_eeprom_access {
-       u16 action;
+       __le16 action;
 
        /* multiple 4 */
-       u16 offset;
-       u16 bytecount;
+       __le16 offset;
+       __le16 bytecount;
        u8 value;
 } __attribute__ ((packed));
 
 struct cmd_ds_802_11_tpc_cfg {
-       u16 action;
+       __le16 action;
        u8 enable;
        s8 P0;
        s8 P1;
@@ -562,13 +562,13 @@ struct cmd_ds_802_11_tpc_cfg {
 } __attribute__ ((packed));
 
 struct cmd_ds_802_11_led_ctrl {
-       u16 action;
-       u16 numled;
+       __le16 action;
+       __le16 numled;
        u8 data[256];
 } __attribute__ ((packed));
 
 struct cmd_ds_802_11_pwr_cfg {
-       u16 action;
+       __le16 action;
        u8 enable;
        s8 PA_P0;
        s8 PA_P1;
@@ -576,21 +576,21 @@ struct cmd_ds_802_11_pwr_cfg {
 } __attribute__ ((packed));
 
 struct cmd_ds_802_11_afc {
-       u16 afc_auto;
+       __le16 afc_auto;
        union {
                struct {
-                       u16 threshold;
-                       u16 period;
+                       __le16 threshold;
+                       __le16 period;
                };
                struct {
-                       s16 timing_offset;
-                       s16 carrier_offset;
+                       __le16 timing_offset; /* signed */
+                       __le16 carrier_offset; /* signed */
                };
        };
 } __attribute__ ((packed));
 
 struct cmd_tx_rate_query {
-       u16 txrate;
+       __le16 txrate;
 } __attribute__ ((packed));
 
 struct cmd_ds_get_tsf {
@@ -598,35 +598,35 @@ struct cmd_ds_get_tsf {
 } __attribute__ ((packed));
 
 struct cmd_ds_bt_access {
-       u16 action;
-       u32 id;
+       __le16 action;
+       __le32 id;
        u8 addr1[ETH_ALEN];
        u8 addr2[ETH_ALEN];
 } __attribute__ ((packed));
 
 struct cmd_ds_fwt_access {
-       u16 action;
-       u32 id;
+       __le16 action;
+       __le32 id;
        u8 valid;
        u8 da[ETH_ALEN];
        u8 dir;
        u8 ra[ETH_ALEN];
-       u32 ssn;
-       u32 dsn;
-       u32 metric;
+       __le32 ssn;
+       __le32 dsn;
+       __le32 metric;
        u8 rate;
        u8 hopcount;
        u8 ttl;
-       u32 expiration;
+       __le32 expiration;
        u8 sleepmode;
-       u32 snr;
-       u32 references;
+       __le32 snr;
+       __le32 references;
        u8 prec[ETH_ALEN];
 } __attribute__ ((packed));
 
 struct cmd_ds_mesh_access {
-       u16 action;
-       u32 data[32];   /* last position reserved */
+       __le16 action;
+       __le32 data[32];        /* last position reserved */
 } __attribute__ ((packed));
 
 /* Number of stats counters returned by the firmware */
@@ -634,10 +634,10 @@ struct cmd_ds_mesh_access {
 
 struct cmd_ds_command {
        /* command header */
-       u16 command;
-       u16 size;
-       u16 seqnum;
-       u16 result;
+       __le16 command;
+       __le16 size;
+       __le16 seqnum;
+       __le16 result;
 
        /* command Body */
        union {
index 70397a3eec7f0437e9e9d6d7993c551eb4d1d41b..8bca306ffad9e7e3b0916db45cbddbf4283a7851 100644 (file)
@@ -27,7 +27,7 @@ int if_usb_issue_boot_command(wlan_private *priv, int ivalue)
        int i;
 
        /* Prepare command */
-       sbootcmd.u32magicnumber = BOOT_CMD_MAGIC_NUMBER;
+       sbootcmd.u32magicnumber = cpu_to_le32(BOOT_CMD_MAGIC_NUMBER);
        sbootcmd.u8cmd_tag = ivalue;
        for (i=0; i<11; i++)
                sbootcmd.au8dumy[i]=0x00;
index de7a2e2babe656f9264196a7e8ec4e1c6f445eb9..b544fcdcd0e739da98e9428372a2710765dd4578 100644 (file)
@@ -141,10 +141,10 @@ static int if_usb_probe(struct usb_interface *intf,
 
        lbs_deb_usbd(&udev->dev, "bcdUSB = 0x%X bDeviceClass = 0x%X"
               " bDeviceSubClass = 0x%X, bDeviceProtocol = 0x%X\n",
-              udev->descriptor.bcdUSB,
-              udev->descriptor.bDeviceClass,
-              udev->descriptor.bDeviceSubClass,
-              udev->descriptor.bDeviceProtocol);
+                    le16_to_cpu(udev->descriptor.bcdUSB),
+                    udev->descriptor.bDeviceClass,
+                    udev->descriptor.bDeviceSubClass,
+                    udev->descriptor.bDeviceProtocol);
 
        for (i = 0; i < iface_desc->desc.bNumEndpoints; ++i) {
                endpoint = &iface_desc->endpoint[i].desc;
@@ -153,10 +153,8 @@ static int if_usb_probe(struct usb_interface *intf,
                        USB_ENDPOINT_XFER_BULK)) {
                        /* we found a bulk in endpoint */
                        lbs_deb_usbd(&udev->dev, "Bulk in size is %d\n",
-                              endpoint->wMaxPacketSize);
-                       if (!
-                           (cardp->rx_urb =
-                            usb_alloc_urb(0, GFP_KERNEL))) {
+                                    le16_to_cpu(endpoint->wMaxPacketSize));
+                       if (!(cardp->rx_urb = usb_alloc_urb(0, GFP_KERNEL))) {
                                lbs_deb_usbd(&udev->dev,
                                       "Rx URB allocation failed\n");
                                goto dealloc;
@@ -164,7 +162,7 @@ static int if_usb_probe(struct usb_interface *intf,
                        cardp->rx_urb_recall = 0;
 
                        cardp->bulk_in_size =
-                           endpoint->wMaxPacketSize;
+                               le16_to_cpu(endpoint->wMaxPacketSize);
                        cardp->bulk_in_endpointAddr =
                            (endpoint->
                             bEndpointAddress & USB_ENDPOINT_NUMBER_MASK);
@@ -178,19 +176,17 @@ static int if_usb_probe(struct usb_interface *intf,
                    && ((endpoint->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) ==
                        USB_ENDPOINT_XFER_BULK)) {
                        /* We found bulk out endpoint */
-                       if (!
-                           (cardp->tx_urb =
-                            usb_alloc_urb(0, GFP_KERNEL))) {
+                       if (!(cardp->tx_urb = usb_alloc_urb(0, GFP_KERNEL))) {
                                lbs_deb_usbd(&udev->dev,
                                       "Tx URB allocation failed\n");
                                goto dealloc;
                        }
 
                        cardp->bulk_out_size =
-                           endpoint->wMaxPacketSize;
+                               le16_to_cpu(endpoint->wMaxPacketSize);
                        lbs_deb_usbd(&udev->dev,
-                                   "Bulk out size is %d\n",
-                                   endpoint->wMaxPacketSize);
+                                    "Bulk out size is %d\n",
+                                    le16_to_cpu(endpoint->wMaxPacketSize));
                        cardp->bulk_out_endpointAddr =
                            endpoint->bEndpointAddress;
                        lbs_deb_usbd(&udev->dev, "out_endpoint = %d\n",
@@ -313,7 +309,7 @@ static int if_prog_firmware(wlan_private * priv)
 
        /* lbs_deb_usbd(&cardp->udev->dev,"Copy Data\n"); */
        memcpy(fwdata->data, &firmware[cardp->totalbytes],
-              fwdata->fwheader.datalength);
+              le32_to_cpu(fwdata->fwheader.datalength));
 
        /*
        lbs_deb_usbd(&cardp->udev->dev,
@@ -322,13 +318,13 @@ static int if_prog_firmware(wlan_private * priv)
 
        cardp->fwseqnum = cardp->fwseqnum + 1;
 
-       fwdata->seqnum = cardp->fwseqnum;
-       cardp->lastseqnum = fwdata->seqnum;
-       cardp->totalbytes += fwdata->fwheader.datalength;
+       fwdata->seqnum = cpu_to_le32(cardp->fwseqnum);
+       cardp->lastseqnum = cardp->fwseqnum;
+       cardp->totalbytes += le32_to_cpu(fwdata->fwheader.datalength);
 
-       if (fwheader->dnldcmd == FW_HAS_DATA_TO_RECV) {
+       if (fwheader->dnldcmd == cpu_to_le32(FW_HAS_DATA_TO_RECV)) {
                /*
-               lbs_deb_usbd(&cardp->udev->dev, "There is data to follow\n");
+               lbs_deb_usbd(&cardp->udev->dev, "There are data to follow\n");
                lbs_deb_usbd(&cardp->udev->dev,
                            "seqnum = %d totalbytes = %d\n", cardp->fwseqnum,
                            cardp->totalbytes);
@@ -486,7 +482,7 @@ static void if_usb_receive_fwload(struct urb *urb)
        if (cardp->bootcmdresp == 0) {
                memcpy (&bootcmdresp, skb->data + IPFIELD_ALIGN_OFFSET,
                        sizeof(bootcmdresp));
-               if (cardp->udev->descriptor.bcdDevice < 0x3106) {
+               if (le16_to_cpu(cardp->udev->descriptor.bcdDevice) < 0x3106) {
                        kfree_skb(skb);
                        if_usb_submit_rx_urb_fwload(priv);
                        cardp->bootcmdresp = 1;
@@ -494,10 +490,10 @@ static void if_usb_receive_fwload(struct urb *urb)
                                    "Received valid boot command response\n");
                        return;
                }
-               if (bootcmdresp.u32magicnumber != BOOT_CMD_MAGIC_NUMBER) {
+               if (bootcmdresp.u32magicnumber != cpu_to_le32(BOOT_CMD_MAGIC_NUMBER)) {
                        lbs_pr_info(
                                "boot cmd response wrong magic number (0x%x)\n",
-                               bootcmdresp.u32magicnumber);
+                               le32_to_cpu(bootcmdresp.u32magicnumber));
                } else if (bootcmdresp.u8cmd_tag != BOOT_CMD_FW_BY_USB) {
                        lbs_pr_info(
                                "boot cmd response cmd_tag error (%d)\n",
@@ -672,7 +668,7 @@ static void if_usb_receive(struct urb *urb)
        case CMD_TYPE_INDICATION:
                /* Event cause handling */
                spin_lock(&priv->adapter->driver_lock);
-               cardp->usb_event_cause = *(u32 *) (recvbuff + MESSAGE_HEADER_LEN);
+               cardp->usb_event_cause = le32_to_cpu(*(__le32 *) (recvbuff + MESSAGE_HEADER_LEN));
                lbs_deb_usbd(&cardp->udev->dev,"**EVENT** 0x%X\n",
                            cardp->usb_event_cause);
                if (cardp->usb_event_cause & 0xffff0000) {
@@ -680,7 +676,7 @@ static void if_usb_receive(struct urb *urb)
                        spin_unlock(&priv->adapter->driver_lock);
                        break;
                }
-               cardp->usb_event_cause = le32_to_cpu(cardp->usb_event_cause) << 3;
+               cardp->usb_event_cause <<= 3;
                cardp->usb_int_cause |= his_cardevent;
                kfree_skb(skb);
                libertas_interrupt(priv->dev);
index bfad79eb43cf5c84e27d59690258e9934570e286..3ed46a33fd214bb840fc6987a0239d4852be2f66 100644 (file)
@@ -20,7 +20,7 @@
 
 struct bootcmdstr
 {
-       u32 u32magicnumber;
+       __le32 u32magicnumber;
        u8  u8cmd_tag;
        u8  au8dumy[11];
 };
@@ -30,7 +30,7 @@ struct bootcmdstr
 
 struct bootcmdrespStr
 {
-       u32 u32magicnumber;
+       __le32 u32magicnumber;
        u8  u8cmd_tag;
        u8  u8result;
        u8  au8dumy[2];
@@ -76,24 +76,24 @@ struct usb_card_rec {
 
 /** fwheader */
 struct fwheader {
-       u32 dnldcmd;
-       u32 baseaddr;
-       u32 datalength;
-       u32 CRC;
+       __le32 dnldcmd;
+       __le32 baseaddr;
+       __le32 datalength;
+       __le32 CRC;
 };
 
 #define FW_MAX_DATA_BLK_SIZE   600
 /** FWData */
 struct FWData {
        struct fwheader fwheader;
-       u32 seqnum;
+       __le32 seqnum;
        u8 data[FW_MAX_DATA_BLK_SIZE];
 };
 
 /** fwsyncheader */
 struct fwsyncheader {
-       u32 cmd;
-       u32 seqnum;
+       __le32 cmd;
+       __le32 seqnum;
 };
 
 #define FW_HAS_DATA_TO_RECV            0x00000001
index 4b145e3e7db1527151290452946b301ae1f23379..f41081585564eb65ba9dd9e6138c36fc85f92695 100644 (file)
@@ -216,7 +216,7 @@ static int wlan_bt_list_ioctl(wlan_private * priv, struct ifreq *req)
        struct iwreq *wrq = (struct iwreq *)req;
        /* used to pass id and store the bt entry returned by the FW */
        union {
-               int id;
+               u32 id;
                char addr1addr2[2 * ETH_ALEN];
        } param;
        static char outstr[64];
@@ -272,7 +272,7 @@ static int wlan_bt_set_invert_ioctl(wlan_private * priv, struct ifreq *req)
        int ret;
        struct iwreq *wrq = (struct iwreq *)req;
        union {
-               int id;
+               u32 id;
                char addr1addr2[2 * ETH_ALEN];
        } param;
 
@@ -300,7 +300,7 @@ static int wlan_bt_get_invert_ioctl(wlan_private * priv, struct ifreq *req)
        struct iwreq *wrq = (struct iwreq *)req;
        int ret;
        union {
-               int id;
+               u32 id;
                char addr1addr2[2 * ETH_ALEN];
        } param;
 
@@ -365,7 +365,7 @@ static int wlan_fwt_add_ioctl(wlan_private * priv, struct ifreq *req)
                fwt_access.metric =
                        cpu_to_le32(simple_strtoul(ptr, &ptr, 10));
        else
-               fwt_access.metric = FWT_DEFAULT_METRIC;
+               fwt_access.metric = cpu_to_le32(FWT_DEFAULT_METRIC);
 
        if ((ptr = next_param(ptr)))
                fwt_access.dir = (u8)simple_strtoul(ptr, &ptr, 10);
@@ -381,13 +381,13 @@ static int wlan_fwt_add_ioctl(wlan_private * priv, struct ifreq *req)
                fwt_access.ssn =
                        cpu_to_le32(simple_strtoul(ptr, &ptr, 10));
        else
-               fwt_access.ssn = FWT_DEFAULT_SSN;
+               fwt_access.ssn = cpu_to_le32(FWT_DEFAULT_SSN);
 
        if ((ptr = next_param(ptr)))
                fwt_access.dsn =
                        cpu_to_le32(simple_strtoul(ptr, &ptr, 10));
        else
-               fwt_access.dsn = FWT_DEFAULT_DSN;
+               fwt_access.dsn = cpu_to_le32(FWT_DEFAULT_DSN);
 
        if ((ptr = next_param(ptr)))
                fwt_access.hopcount = simple_strtoul(ptr, &ptr, 10);
@@ -403,7 +403,7 @@ static int wlan_fwt_add_ioctl(wlan_private * priv, struct ifreq *req)
                fwt_access.expiration =
                        cpu_to_le32(simple_strtoul(ptr, &ptr, 10));
        else
-               fwt_access.expiration = FWT_DEFAULT_EXPIRATION;
+               fwt_access.expiration = cpu_to_le32(FWT_DEFAULT_EXPIRATION);
 
        if ((ptr = next_param(ptr)))
                fwt_access.sleepmode = (u8)simple_strtoul(ptr, &ptr, 10);
@@ -414,7 +414,7 @@ static int wlan_fwt_add_ioctl(wlan_private * priv, struct ifreq *req)
                fwt_access.snr =
                        cpu_to_le32(simple_strtoul(ptr, &ptr, 10));
        else
-               fwt_access.snr = FWT_DEFAULT_SNR;
+               fwt_access.snr = cpu_to_le32(FWT_DEFAULT_SNR);
 
 #ifdef DEBUG
        {
@@ -864,7 +864,7 @@ static int wlan_mesh_set_ttl_ioctl(wlan_private * priv, int ttl)
                return -EINVAL;
 
        memset(&mesh_access, 0, sizeof(mesh_access));
-       mesh_access.data[0] = ttl;
+       mesh_access.data[0] = cpu_to_le32(ttl);
 
        ret = libertas_prepare_and_send_command(priv, cmd_mesh_access,
                                                cmd_act_mesh_set_ttl,
index f222e78a922c8dc409cb17fa3ae475ab985b614d..781b563a2f4fd2cd006a2057e883e158547aa498 100644 (file)
@@ -306,13 +306,11 @@ int libertas_cmd_80211_deauthenticate(wlan_private * priv,
        lbs_deb_enter(LBS_DEB_JOIN);
 
        cmd->command = cpu_to_le16(cmd_802_11_deauthenticate);
-       cmd->size =
-           cpu_to_le16(sizeof(struct cmd_ds_802_11_deauthenticate) +
+       cmd->size = cpu_to_le16(sizeof(struct cmd_ds_802_11_deauthenticate) +
                             S_DS_GEN);
 
        /* set AP MAC address */
-       memmove(dauth->macaddr, adapter->curbssparams.bssid,
-               ETH_ALEN);
+       memmove(dauth->macaddr, adapter->curbssparams.bssid, ETH_ALEN);
 
        /* Reason code 3 = Station is leaving */
 #define REASON_CODE_STA_LEAVING 3
@@ -333,7 +331,7 @@ int libertas_cmd_80211_associate(wlan_private * priv,
        u8 *card_rates;
        u8 *pos;
        int card_rates_size;
-       u16 tmpcap;
+       u16 tmpcap, tmplen;
        struct mrvlietypes_ssidparamset *ssid;
        struct mrvlietypes_phyparamset *phy;
        struct mrvlietypes_ssparamset *ss;
@@ -355,7 +353,7 @@ int libertas_cmd_80211_associate(wlan_private * priv,
        pos += sizeof(passo->peerstaaddr);
 
        /* set the listen interval */
-       passo->listeninterval = adapter->listeninterval;
+       passo->listeninterval = cpu_to_le16(adapter->listeninterval);
 
        pos += sizeof(passo->capinfo);
        pos += sizeof(passo->listeninterval);
@@ -364,14 +362,14 @@ int libertas_cmd_80211_associate(wlan_private * priv,
 
        ssid = (struct mrvlietypes_ssidparamset *) pos;
        ssid->header.type = cpu_to_le16(TLV_TYPE_SSID);
-       ssid->header.len = bss->ssid.ssidlength;
+       ssid->header.len = cpu_to_le16(bss->ssid.ssidlength);
        memcpy(ssid->ssid, bss->ssid.ssid, ssid->header.len);
        pos += sizeof(ssid->header) + ssid->header.len;
        ssid->header.len = cpu_to_le16(ssid->header.len);
 
        phy = (struct mrvlietypes_phyparamset *) pos;
        phy->header.type = cpu_to_le16(TLV_TYPE_PHY_DS);
-       phy->header.len = sizeof(phy->fh_ds.dsparamset);
+       phy->header.len = cpu_to_le16(sizeof(phy->fh_ds.dsparamset));
        memcpy(&phy->fh_ds.dsparamset,
               &bss->phyparamset.dsparamset.currentchan,
               sizeof(phy->fh_ds.dsparamset));
@@ -380,7 +378,7 @@ int libertas_cmd_80211_associate(wlan_private * priv,
 
        ss = (struct mrvlietypes_ssparamset *) pos;
        ss->header.type = cpu_to_le16(TLV_TYPE_CF);
-       ss->header.len = sizeof(ss->cf_ibss.cfparamset);
+       ss->header.len = cpu_to_le16(sizeof(ss->cf_ibss.cfparamset));
        pos += sizeof(ss->header) + ss->header.len;
        ss->header.len = cpu_to_le16(ss->header.len);
 
@@ -398,33 +396,34 @@ int libertas_cmd_80211_associate(wlan_private * priv,
                goto done;
        }
 
-       rates->header.len = min_t(size_t, strlen(rates->rates), WLAN_SUPPORTED_RATES);
-       adapter->curbssparams.numofrates = rates->header.len;
+       tmplen = min_t(size_t, strlen(rates->rates), WLAN_SUPPORTED_RATES);
+       adapter->curbssparams.numofrates = tmplen;
 
-       pos += sizeof(rates->header) + rates->header.len;
-       rates->header.len = cpu_to_le16(rates->header.len);
+       pos += sizeof(rates->header) + tmplen;
+       rates->header.len = cpu_to_le16(tmplen);
 
        if (assoc_req->secinfo.WPAenabled || assoc_req->secinfo.WPA2enabled) {
                rsn = (struct mrvlietypes_rsnparamset *) pos;
-               rsn->header.type = (u16) assoc_req->wpa_ie[0];  /* WPA_IE or WPA2_IE */
-               rsn->header.type = cpu_to_le16(rsn->header.type);
-               rsn->header.len = (u16) assoc_req->wpa_ie[1];
-               memcpy(rsn->rsnie, &assoc_req->wpa_ie[2], rsn->header.len);
+               /* WPA_IE or WPA2_IE */
+               rsn->header.type = cpu_to_le16((u16) assoc_req->wpa_ie[0]);
+               tmplen = (u16) assoc_req->wpa_ie[1];
+               rsn->header.len = cpu_to_le16(tmplen);
+               memcpy(rsn->rsnie, &assoc_req->wpa_ie[2], tmplen);
                lbs_dbg_hex("ASSOC_CMD: RSN IE", (u8 *) rsn,
-                       sizeof(rsn->header) + rsn->header.len);
-               pos += sizeof(rsn->header) + rsn->header.len;
-               rsn->header.len = cpu_to_le16(rsn->header.len);
+                       sizeof(rsn->header) + tmplen);
+               pos += sizeof(rsn->header) + tmplen;
        }
 
        /* update curbssparams */
-       adapter->curbssparams.channel =
-           (bss->phyparamset.dsparamset.currentchan);
+       adapter->curbssparams.channel = bss->phyparamset.dsparamset.currentchan;
 
        /* Copy the infra. association rates into Current BSS state structure */
        memcpy(&adapter->curbssparams.datarates, &rates->rates,
-              min_t(size_t, sizeof(adapter->curbssparams.datarates), rates->header.len));
+              min_t(size_t, sizeof(adapter->curbssparams.datarates),
+                    cpu_to_le16(rates->header.len)));
 
-       lbs_deb_join("ASSOC_CMD: rates->header.len = %d\n", rates->header.len);
+       lbs_deb_join("ASSOC_CMD: rates->header.len = %d\n",
+                    cpu_to_le16(rates->header.len));
 
        /* set IBSS field */
        if (bss->mode == IW_MODE_INFRA) {
@@ -443,8 +442,7 @@ int libertas_cmd_80211_associate(wlan_private * priv,
        memcpy(&tmpcap, &bss->cap, sizeof(passo->capinfo));
        tmpcap &= CAPINFO_MASK;
        lbs_deb_join("ASSOC_CMD: tmpcap=%4X CAPINFO_MASK=%4X\n",
-              tmpcap, CAPINFO_MASK);
-       tmpcap = cpu_to_le16(tmpcap);
+                    tmpcap, CAPINFO_MASK);
        memcpy(&passo->capinfo, &tmpcap, sizeof(passo->capinfo));
 
 done:
@@ -460,7 +458,6 @@ int libertas_cmd_80211_ad_hoc_start(wlan_private * priv,
        int ret = 0;
        int cmdappendsize = 0;
        int i;
-       u16 tmpcap;
        struct assoc_request * assoc_req = pdata_buf;
 
        lbs_deb_enter(LBS_DEB_JOIN);
@@ -492,7 +489,7 @@ int libertas_cmd_80211_ad_hoc_start(wlan_private * priv,
        /* set the BSS type */
        adhs->bsstype = cmd_bss_type_ibss;
        adapter->mode = IW_MODE_ADHOC;
-       adhs->beaconperiod = adapter->beaconperiod;
+       adhs->beaconperiod = cpu_to_le16(adapter->beaconperiod);
 
        /* set Physical param set */
 #define DS_PARA_IE_ID   3
@@ -504,7 +501,7 @@ int libertas_cmd_80211_ad_hoc_start(wlan_private * priv,
        WARN_ON(!assoc_req->channel);
 
        lbs_deb_join("ADHOC_S_CMD: Creating ADHOC on channel %d\n",
-              assoc_req->channel);
+                    assoc_req->channel);
 
        adhs->phyparamset.dsparamset.currentchan = assoc_req->channel;
 
@@ -514,7 +511,7 @@ int libertas_cmd_80211_ad_hoc_start(wlan_private * priv,
 
        adhs->ssparamset.ibssparamset.elementid = IBSS_PARA_IE_ID;
        adhs->ssparamset.ibssparamset.len = IBSS_PARA_IE_LEN;
-       adhs->ssparamset.ibssparamset.atimwindow = adapter->atimwindow;
+       adhs->ssparamset.ibssparamset.atimwindow = cpu_to_le16(adapter->atimwindow);
 
        /* set capability info */
        adhs->cap.ess = 0;
@@ -562,13 +559,8 @@ int libertas_cmd_80211_ad_hoc_start(wlan_private * priv,
                goto done;
        }
 
-       cmd->size =
-           cpu_to_le16(sizeof(struct cmd_ds_802_11_ad_hoc_start)
-                            + S_DS_GEN + cmdappendsize);
-
-       memcpy(&tmpcap, &adhs->cap, sizeof(u16));
-       tmpcap = cpu_to_le16(tmpcap);
-       memcpy(&adhs->cap, &tmpcap, sizeof(u16));
+       cmd->size = cpu_to_le16(sizeof(struct cmd_ds_802_11_ad_hoc_start) +
+                               S_DS_GEN + cmdappendsize);
 
        ret = 0;
 done:
@@ -605,7 +597,7 @@ int libertas_cmd_80211_ad_hoc_join(wlan_private * priv,
 
        padhocjoin->bssdescriptor.bsstype = cmd_bss_type_ibss;
 
-       padhocjoin->bssdescriptor.beaconperiod = bss->beaconperiod;
+       padhocjoin->bssdescriptor.beaconperiod = cpu_to_le16(bss->beaconperiod);
 
        memcpy(&padhocjoin->bssdescriptor.BSSID, &bss->bssid, ETH_ALEN);
        memcpy(&padhocjoin->bssdescriptor.SSID, &bss->ssid.ssid, bss->ssid.ssidlength);
@@ -634,8 +626,7 @@ int libertas_cmd_80211_ad_hoc_join(wlan_private * priv,
        padhocjoin->failtimeout = cpu_to_le16(MRVDRV_ASSOCIATION_TIME_OUT);
 
        /* probedelay */
-       padhocjoin->probedelay =
-           cpu_to_le16(cmd_scan_probe_delay_time);
+       padhocjoin->probedelay = cpu_to_le16(cmd_scan_probe_delay_time);
 
        /* Copy Data rates from the rates recorded in scan response */
        memset(padhocjoin->bssdescriptor.datarates, 0,
@@ -679,9 +670,9 @@ int libertas_cmd_80211_ad_hoc_join(wlan_private * priv,
 
        if (adapter->psmode == wlan802_11powermodemax_psp) {
                /* wake up first */
-               enum WLAN_802_11_POWER_MODE Localpsmode;
+               __le32 Localpsmode;
 
-               Localpsmode = wlan802_11powermodecam;
+               Localpsmode = cpu_to_le32(wlan802_11powermodecam);
                ret = libertas_prepare_and_send_command(priv,
                                            cmd_802_11_ps_mode,
                                            cmd_act_set,
@@ -698,16 +689,8 @@ int libertas_cmd_80211_ad_hoc_join(wlan_private * priv,
                goto done;
        }
 
-       cmd->size =
-           cpu_to_le16(sizeof(struct cmd_ds_802_11_ad_hoc_join)
-                            + S_DS_GEN + cmdappendsize);
-
-       memcpy(&tmpcap, &padhocjoin->bssdescriptor.cap,
-              sizeof(struct ieeetypes_capinfo));
-       tmpcap = cpu_to_le16(tmpcap);
-
-       memcpy(&padhocjoin->bssdescriptor.cap,
-              &tmpcap, sizeof(struct ieeetypes_capinfo));
+       cmd->size = cpu_to_le16(sizeof(struct cmd_ds_802_11_ad_hoc_join) +
+                               S_DS_GEN + cmdappendsize);
 
 done:
        lbs_deb_leave_args(LBS_DEB_JOIN, "ret %d", ret);
@@ -734,11 +717,11 @@ int libertas_ret_80211_associate(wlan_private * priv,
 
        passocrsp = (struct ieeetypes_assocrsp *) & resp->params;
 
-       if (passocrsp->statuscode) {
+       if (le16_to_cpu(passocrsp->statuscode)) {
                libertas_mac_event_disconnected(priv);
 
                lbs_deb_join("ASSOC_RESP: Association failed, status code = %d\n",
-                    passocrsp->statuscode);
+                            le16_to_cpu(passocrsp->statuscode));
 
                ret = -1;
                goto done;
index 072eeebfdcd15efab49e4614afe4c3bfb36e2884..ec9be0c51c698dbb13688fc127ea6cbbd03dba08 100644 (file)
@@ -190,7 +190,7 @@ static ssize_t libertas_mpp_get(struct device * dev,
                        cmd_act_mesh_get_mpp,
                        cmd_option_waitforrsp, 0, (void *)&mesh_access);
 
-       return snprintf(buf, 3, "%d\n", mesh_access.data[0]);
+       return snprintf(buf, 3, "%d\n", le32_to_cpu(mesh_access.data[0]));
 }
 
 /**
@@ -199,9 +199,12 @@ static ssize_t libertas_mpp_get(struct device * dev,
 static ssize_t libertas_mpp_set(struct device * dev,
                struct device_attribute *attr, const char * buf, size_t count) {
        struct cmd_ds_mesh_access mesh_access;
+       uint32_t datum;
 
        memset(&mesh_access, 0, sizeof(mesh_access));
-       sscanf(buf, "%d", &(mesh_access.data[0]));
+       sscanf(buf, "%d", &datum);
+       mesh_access.data[0] = cpu_to_le32(datum);
+
        libertas_prepare_and_send_command((to_net_dev(dev))->priv,
                        cmd_mesh_access,
                        cmd_act_mesh_set_mpp,
@@ -213,8 +216,7 @@ static ssize_t libertas_mpp_set(struct device * dev,
  * libertas_mpp attribute to be exported per mshX interface
  * through sysfs (/sys/class/net/mshX/libertas-mpp)
  */
-static DEVICE_ATTR(libertas_mpp, 0644, libertas_mpp_get,
-               libertas_mpp_set );
+static DEVICE_ATTR(libertas_mpp, 0644, libertas_mpp_get, libertas_mpp_set );
 
 /**
  *  @brief Check if the device can be open and wait if necessary.
index ec64f6c174bbec77201b4c22a69eec2c995ddc11..5d70a7625150151ee2ff7f2ace9045b94fc8085f 100644 (file)
@@ -200,7 +200,7 @@ int libertas_process_rxed_packet(wlan_private * priv, struct sk_buff *skb)
        /*
         * Check rxpd status and update 802.3 stat,
         */
-       if (!(p_rx_pd->status & MRVDRV_RXPD_STATUS_OK)) {
+       if (!(p_rx_pd->status & cpu_to_le16(MRVDRV_RXPD_STATUS_OK))) {
                lbs_deb_rx("rx err: frame received with bad status\n");
                lbs_pr_alert("rxpd not ok\n");
                priv->stats.rx_errors++;
@@ -353,7 +353,7 @@ static int process_rxed_802_11_packet(wlan_private * priv, struct sk_buff *skb)
        /*
         * Check rxpd status and update 802.3 stat,
         */
-       if (!(prxpd->status & MRVDRV_RXPD_STATUS_OK)) {
+       if (!(prxpd->status & cpu_to_le16(MRVDRV_RXPD_STATUS_OK))) {
                //lbs_deb_rx("rx err: frame received with bad status\n");
                priv->stats.rx_errors++;
        }
@@ -386,7 +386,7 @@ static int process_rxed_802_11_packet(wlan_private * priv, struct sk_buff *skb)
                /* XXX must check no carryout */
                radiotap_hdr.antsignal = prxpd->snr + prxpd->nf;
                radiotap_hdr.rx_flags = 0;
-               if (!(prxpd->status & MRVDRV_RXPD_STATUS_OK))
+               if (!(prxpd->status & cpu_to_le16(MRVDRV_RXPD_STATUS_OK)))
                        radiotap_hdr.rx_flags |= IEEE80211_RADIOTAP_F_RX_BADFCS;
                //memset(radiotap_hdr.pad, 0x11, IEEE80211_RADIOTAP_HDRLEN - 18);
 
index a1ab698088dbba551cbb8240aac6f87f5afbc4b7..9799d87aaa3b4372c09d7bbceec82ce8f9c9e226 100644 (file)
@@ -323,14 +323,12 @@ static void wlan_scan_create_channel_list(wlan_private * priv,
 
                        if (scantype == cmd_scan_type_passive) {
                                scanchanlist[chanidx].maxscantime =
-                                   cpu_to_le16
-                                   (MRVDRV_PASSIVE_SCAN_CHAN_TIME);
+                                   cpu_to_le16(MRVDRV_PASSIVE_SCAN_CHAN_TIME);
                                scanchanlist[chanidx].chanscanmode.passivescan =
                                    1;
                        } else {
                                scanchanlist[chanidx].maxscantime =
-                                   cpu_to_le16
-                                   (MRVDRV_ACTIVE_SCAN_CHAN_TIME);
+                                   cpu_to_le16(MRVDRV_ACTIVE_SCAN_CHAN_TIME);
                                scanchanlist[chanidx].chanscanmode.passivescan =
                                    0;
                        }
@@ -487,16 +485,11 @@ wlan_scan_setup_scan_config(wlan_private * priv,
        /* If the input config or adapter has the number of Probes set, add tlv */
        if (numprobes) {
                pnumprobestlv = (struct mrvlietypes_numprobes *) ptlvpos;
-               pnumprobestlv->header.type =
-                   cpu_to_le16(TLV_TYPE_NUMPROBES);
-               pnumprobestlv->header.len = sizeof(pnumprobestlv->numprobes);
+               pnumprobestlv->header.type = cpu_to_le16(TLV_TYPE_NUMPROBES);
+               pnumprobestlv->header.len = cpu_to_le16(2);
                pnumprobestlv->numprobes = cpu_to_le16(numprobes);
 
-               ptlvpos +=
-                   sizeof(pnumprobestlv->header) + pnumprobestlv->header.len;
-
-               pnumprobestlv->header.len =
-                   cpu_to_le16(pnumprobestlv->header.len);
+               ptlvpos += sizeof(*pnumprobestlv);
        }
 
        /*
@@ -655,8 +648,11 @@ static int wlan_scan_channel_list(wlan_private * priv,
                               ptmpchan, sizeof(pchantlvout->chanscanparam));
 
                        /* Increment the TLV header length by the size appended */
-                       pchantlvout->header.len +=
-                           sizeof(pchantlvout->chanscanparam);
+                       /* Ew, it would be _so_ nice if we could just declare the
+                          variable little-endian and let GCC handle it for us */
+                       pchantlvout->header.len =
+                               cpu_to_le16(le16_to_cpu(pchantlvout->header.len) +
+                                           sizeof(pchantlvout->chanscanparam));
 
                        /*
                         *  The tlv buffer length is set to the number of bytes of the
@@ -670,7 +666,7 @@ static int wlan_scan_channel_list(wlan_private * priv,
                        /*  Add the size of the channel tlv header and the data length */
                        pscancfgout->tlvbufferlen +=
                            (sizeof(pchantlvout->header)
-                            + pchantlvout->header.len);
+                            + le16_to_cpu(pchantlvout->header.len));
 
                        /* Increment the index to the channel tlv we are constructing */
                        tlvidx++;
@@ -955,8 +951,7 @@ static int libertas_process_bss(struct bss_descriptor * bss,
 
        if (*bytesleft >= sizeof(beaconsize)) {
                /* Extract & convert beacon size from the command buffer */
-               memcpy(&beaconsize, *pbeaconinfo, sizeof(beaconsize));
-               beaconsize = le16_to_cpu(beaconsize);
+               beaconsize = le16_to_cpup((void *)*pbeaconinfo);
                *bytesleft -= sizeof(beaconsize);
                *pbeaconinfo += sizeof(beaconsize);
        }
@@ -995,28 +990,25 @@ static int libertas_process_bss(struct bss_descriptor * bss,
         */
 
        /* RSSI is 1 byte long */
-       bss->rssi = le32_to_cpu((long)(*pcurrentptr));
+       bss->rssi = *pcurrentptr;
        lbs_deb_scan("process_bss: RSSI=%02X\n", *pcurrentptr);
        pcurrentptr += 1;
        bytesleftforcurrentbeacon -= 1;
 
        /* time stamp is 8 bytes long */
-       memcpy(fixedie.timestamp, pcurrentptr, 8);
-       memcpy(bss->timestamp, pcurrentptr, 8);
+       fixedie.timestamp = bss->timestamp = le64_to_cpup((void *)pcurrentptr);
        pcurrentptr += 8;
        bytesleftforcurrentbeacon -= 8;
 
        /* beacon interval is 2 bytes long */
-       memcpy(&fixedie.beaconinterval, pcurrentptr, 2);
-       bss->beaconperiod = le16_to_cpu(fixedie.beaconinterval);
+       fixedie.beaconinterval = bss->beaconperiod = le16_to_cpup((void *)pcurrentptr);
        pcurrentptr += 2;
        bytesleftforcurrentbeacon -= 2;
 
        /* capability information is 2 bytes long */
-       memcpy(&fixedie.capabilities, pcurrentptr, 2);
+        memcpy(&fixedie.capabilities, pcurrentptr, 2);
        lbs_deb_scan("process_bss: fixedie.capabilities=0x%X\n",
               fixedie.capabilities);
-       fixedie.capabilities = le16_to_cpu(fixedie.capabilities);
        pcap = (struct ieeetypes_capinfo *) & fixedie.capabilities;
        memcpy(&bss->cap, pcap, sizeof(struct ieeetypes_capinfo));
        pcurrentptr += 2;
@@ -1077,8 +1069,10 @@ static int libertas_process_bss(struct bss_descriptor * bss,
                        pFH = (struct ieeetypes_fhparamset *) pcurrentptr;
                        memmove(&bss->phyparamset.fhparamset, pFH,
                                sizeof(struct ieeetypes_fhparamset));
+#if 0 /* I think we can store these LE */
                        bss->phyparamset.fhparamset.dwelltime
                            = le16_to_cpu(bss->phyparamset.fhparamset.dwelltime);
+#endif
                        break;
 
                case DS_PARAM_SET:
@@ -1099,8 +1093,10 @@ static int libertas_process_bss(struct bss_descriptor * bss,
                        bss->atimwindow = le32_to_cpu(pibss->atimwindow);
                        memmove(&bss->ssparamset.ibssparamset, pibss,
                                sizeof(struct ieeetypes_ibssparamset));
+#if 0
                        bss->ssparamset.ibssparamset.atimwindow
                            = le16_to_cpu(bss->ssparamset.ibssparamset.atimwindow);
+#endif
                        break;
 
                        /* Handle Country Info IE */
@@ -1744,7 +1740,8 @@ int libertas_cmd_80211_scan(wlan_private * priv,
                                     + pscancfg->tlvbufferlen + S_DS_GEN);
 
        lbs_deb_scan("SCAN_CMD: command=%x, size=%x, seqnum=%x\n",
-              cmd->command, cmd->size, cmd->seqnum);
+                    le16_to_cpu(cmd->command), le16_to_cpu(cmd->size),
+                    le16_to_cpu(cmd->seqnum));
 
        lbs_deb_leave(LBS_DEB_ASSOC);
        return 0;
@@ -1799,7 +1796,6 @@ int libertas_ret_80211_scan(wlan_private * priv, struct cmd_ds_command *resp)
        int bytesleft;
        int idx;
        int tlvbufsize;
-       u64 tsfval;
        int ret;
 
        lbs_deb_enter(LBS_DEB_ASSOC);
@@ -1905,9 +1901,7 @@ int libertas_ret_80211_scan(wlan_private * priv, struct cmd_ds_command *resp)
                 *   beacon or probe response was received.
                 */
                if (ptsftlv) {
-                       memcpy(&tsfval, &ptsftlv->tsftable[idx], sizeof(tsfval));
-                       tsfval = le64_to_cpu(tsfval);
-                       memcpy(&new.networktsf, &tsfval, sizeof(new.networktsf));
+                       new.networktsf = le64_to_cpup(&ptsftlv->tsftable[idx]);
                }
 
                /* Copy the locally created newbssentry to the scan table */
index df7481c11f680c85ab279f1ef05f29babf2224ae..60a09e347f45517df8fb8596bfebf764338e6898 100644 (file)
@@ -154,7 +154,7 @@ struct bss_descriptor {
        u8 mode;
        u8 libertas_supported_rates[WLAN_SUPPORTED_RATES];
 
-       u8 timestamp[8];        //!< TSF value included in the beacon/probe response
+       __le64 timestamp;       //!< TSF value included in the beacon/probe response
        unsigned long last_scanned;
 
        union ieeetypes_phyparamset phyparamset;
@@ -162,7 +162,7 @@ struct bss_descriptor {
        struct ieeetypes_capinfo cap;
        u8 datarates[WLAN_SUPPORTED_RATES];
 
-       __le64 networktsf;              //!< TSF timestamp from the current firmware TSF
+       u64 networktsf;         //!< TSF timestamp from the current firmware TSF
 
        struct ieeetypes_countryinfofullset countryinfo;
 
index b6cb675f730d70a4208f46bd5ed0cde689183b4b..10d1db0ab3a660ce29bb8d672c7def7c986cc824 100644 (file)
@@ -85,13 +85,13 @@ static int SendSinglePacket(wlan_private * priv, struct sk_buff *skb)
 
        memset(plocaltxpd, 0, sizeof(struct txpd));
 
-       plocaltxpd->tx_packet_length = skb->len;
+       plocaltxpd->tx_packet_length = cpu_to_le16(skb->len);
 
        /* offset of actual data */
-       plocaltxpd->tx_packet_location = sizeof(struct txpd);
+       plocaltxpd->tx_packet_location = cpu_to_le32(sizeof(struct txpd));
 
        /* TxCtrl set by user or default */
-       plocaltxpd->tx_control = adapter->pkttxctrl;
+       plocaltxpd->tx_control = cpu_to_le32(adapter->pkttxctrl);
 
        p802x_hdr = skb->data;
        if (priv->adapter->radiomode == WLAN_RADIOMODE_RADIOTAP) {
@@ -102,15 +102,16 @@ static int SendSinglePacket(wlan_private * priv, struct sk_buff *skb)
                /* set txpd fields from the radiotap header */
                new_rate = convert_radiotap_rate_to_mv(pradiotap_hdr->rate);
                if (new_rate != 0) {
-                       /* erase tx_control[4:0] */
-                       plocaltxpd->tx_control &= ~0x1f;
-                       /* write new tx_control[4:0] */
-                       plocaltxpd->tx_control |= new_rate;
+                       /* use new tx_control[4:0] */
+                       new_rate |= (adapter->pkttxctrl & ~0x1f);
+                       plocaltxpd->tx_control = cpu_to_le32(new_rate);
                }
 
                /* skip the radiotap header */
                p802x_hdr += sizeof(struct tx_radiotap_hdr);
-               plocaltxpd->tx_packet_length -= sizeof(struct tx_radiotap_hdr);
+               plocaltxpd->tx_packet_length =
+                       cpu_to_le32(le32_to_cpu(plocaltxpd->tx_packet_length)
+                                   - sizeof(struct tx_radiotap_hdr));
 
        }
        /* copy destination address from 802.3 or 802.11 header */
@@ -122,19 +123,19 @@ static int SendSinglePacket(wlan_private * priv, struct sk_buff *skb)
        lbs_dbg_hex("txpd", (u8 *) plocaltxpd, sizeof(struct txpd));
 
        if (IS_MESH_FRAME(skb)) {
-               plocaltxpd->tx_control |= TxPD_MESH_FRAME;
+               plocaltxpd->tx_control |= cpu_to_le32(TxPD_MESH_FRAME);
        }
 
        memcpy(ptr, plocaltxpd, sizeof(struct txpd));
 
        ptr += sizeof(struct txpd);
 
-       lbs_dbg_hex("Tx Data", (u8 *) p802x_hdr, plocaltxpd->tx_packet_length);
-       memcpy(ptr, p802x_hdr, plocaltxpd->tx_packet_length);
+       lbs_dbg_hex("Tx Data", (u8 *) p802x_hdr, le32_to_cpu(plocaltxpd->tx_packet_length));
+       memcpy(ptr, p802x_hdr, le32_to_cpu(plocaltxpd->tx_packet_length));
        ret = priv->hw_host_to_card(priv, MVMS_DAT,
-               priv->adapter->tmptxbuf,
-               plocaltxpd->tx_packet_length +
-               sizeof(struct txpd));
+                                   priv->adapter->tmptxbuf,
+                                   le32_to_cpu(plocaltxpd->tx_packet_length) +
+                                   sizeof(struct txpd));
 
        if (ret) {
                lbs_deb_tx("tx err: hw_host_to_card returned 0x%X\n", ret);
index 09d62f8b1a1638b9860ef19dd6cee5cb29724e5a..028e2f3b53d6e0768c2a901bc3e861e10d9add75 100644 (file)
@@ -5,6 +5,7 @@
 #define _WLAN_TYPES_
 
 #include <linux/if_ether.h>
+#include <asm/byteorder.h>
 
 /** IEEE type definitions  */
 enum ieeetypes_elementid {
@@ -29,9 +30,30 @@ enum ieeetypes_elementid {
        EXTRA_IE = 133,
 } __attribute__ ((packed));
 
+#ifdef __BIG_ENDIAN
 #define CAPINFO_MASK   (~(0xda00))
+#else
+#define CAPINFO_MASK   (~(0x00da))
+#endif
 
 struct ieeetypes_capinfo {
+#ifdef __BIG_ENDIAN_BITFIELD
+       u8 chanagility:1;
+       u8 pbcc:1;
+       u8 shortpreamble:1;
+       u8 privacy:1;
+       u8 cfpollrqst:1;
+       u8 cfpollable:1;
+       u8 ibss:1;
+       u8 ess:1;
+       u8 rsrvd1:2;
+       u8 dsssofdm:1;
+       u8 rsvrd2:1;
+       u8 apsd:1;
+       u8 shortslottime:1;
+       u8 rsrvd3:1;
+       u8 spectrummgmt:1;
+#else
        u8 ess:1;
        u8 ibss:1;
        u8 cfpollable:1;
@@ -47,6 +69,7 @@ struct ieeetypes_capinfo {
        u8 rsvrd2:1;
        u8 dsssofdm:1;
        u8 rsrvd1:2;
+#endif
 } __attribute__ ((packed));
 
 struct ieeetypes_cfparamset {
@@ -54,15 +77,15 @@ struct ieeetypes_cfparamset {
        u8 len;
        u8 cfpcnt;
        u8 cfpperiod;
-       u16 cfpmaxduration;
-       u16 cfpdurationremaining;
+       __le16 cfpmaxduration;
+       __le16 cfpdurationremaining;
 } __attribute__ ((packed));
 
 
 struct ieeetypes_ibssparamset {
        u8 elementid;
        u8 len;
-       u16 atimwindow;
+       __le16 atimwindow;
 } __attribute__ ((packed));
 
 union IEEEtypes_ssparamset {
@@ -73,7 +96,7 @@ union IEEEtypes_ssparamset {
 struct ieeetypes_fhparamset {
        u8 elementid;
        u8 len;
-       u16 dwelltime;
+       __le16 dwelltime;
        u8 hopset;
        u8 hoppattern;
        u8 hopindex;
@@ -92,8 +115,8 @@ union ieeetypes_phyparamset {
 
 struct ieeetypes_assocrsp {
        struct ieeetypes_capinfo capability;
-       u16 statuscode;
-       u16 aid;
+       __le16 statuscode;
+       __le16 aid;
        u8 iebuffer[1];
 } __attribute__ ((packed));
 
@@ -138,8 +161,8 @@ struct ieeetypes_assocrsp {
 
 /** TLV related data structures*/
 struct mrvlietypesheader {
-       u16 type;
-       u16 len;
+       __le16 type;
+       __le16 len;
 } __attribute__ ((packed));
 
 struct mrvlietypes_data {
@@ -164,17 +187,23 @@ struct mrvlietypes_wildcardssidparamset {
 } __attribute__ ((packed));
 
 struct chanscanmode {
+#ifdef __BIG_ENDIAN_BITFIELD
+       u8 reserved_2_7:6;
+       u8 disablechanfilt:1;
+       u8 passivescan:1;
+#else
        u8 passivescan:1;
        u8 disablechanfilt:1;
        u8 reserved_2_7:6;
+#endif
 } __attribute__ ((packed));
 
 struct chanscanparamset {
        u8 radiotype;
        u8 channumber;
        struct chanscanmode chanscanmode;
-       u16 minscantime;
-       u16 maxscantime;
+       __le16 minscantime;
+       __le16 maxscantime;
 } __attribute__ ((packed));
 
 struct mrvlietypes_chanlistparamset {
@@ -185,12 +214,12 @@ struct mrvlietypes_chanlistparamset {
 struct cfparamset {
        u8 cfpcnt;
        u8 cfpperiod;
-       u16 cfpmaxduration;
-       u16 cfpdurationremaining;
+       __le16 cfpmaxduration;
+       __le16 cfpdurationremaining;
 } __attribute__ ((packed));
 
 struct ibssparamset {
-       u16 atimwindow;
+       __le16 atimwindow;
 } __attribute__ ((packed));
 
 struct mrvlietypes_ssparamset {
@@ -202,7 +231,7 @@ struct mrvlietypes_ssparamset {
 } __attribute__ ((packed));
 
 struct fhparamset {
-       u16 dwelltime;
+       __le16 dwelltime;
        u8 hopset;
        u8 hoppattern;
        u8 hopindex;
@@ -263,17 +292,17 @@ struct mrvlietypes_beaconsmissed {
 
 struct mrvlietypes_numprobes {
        struct mrvlietypesheader header;
-       u16 numprobes;
+       __le16 numprobes;
 } __attribute__ ((packed));
 
 struct mrvlietypes_bcastprobe {
        struct mrvlietypesheader header;
-       u16 bcastprobe;
+       __le16 bcastprobe;
 } __attribute__ ((packed));
 
 struct mrvlietypes_numssidprobe {
        struct mrvlietypesheader header;
-       u16 numssidprobe;
+       __le16 numssidprobe;
 } __attribute__ ((packed));
 
 struct led_pin {
index e91de104ad67b726aebfb0c779875250a15c3cfe..1abb4bcecc66fb0e2ef32e7502ccdb0a1aa4dd96 100644 (file)
@@ -402,7 +402,7 @@ static int wlan_set_rts(struct net_device *dev, struct iw_request_info *info,
        int ret = 0;
        wlan_private *priv = dev->priv;
        wlan_adapter *adapter = priv->adapter;
-       int rthr = vwrq->value;
+       u32 rthr = vwrq->value;
 
        lbs_deb_enter(LBS_DEB_WEXT);
 
@@ -452,7 +452,7 @@ static int wlan_set_frag(struct net_device *dev, struct iw_request_info *info,
                         struct iw_param *vwrq, char *extra)
 {
        int ret = 0;
-       int fthr = vwrq->value;
+       u32 fthr = vwrq->value;
        wlan_private *priv = dev->priv;
        wlan_adapter *adapter = priv->adapter;
 
@@ -1115,7 +1115,7 @@ static struct iw_statistics *wlan_get_wireless_stats(struct net_device *dev)
        /* Quality by TX errors */
        priv->wstats.discard.retries = priv->stats.tx_errors;
 
-       tx_retries = adapter->logmsg.retry;
+       tx_retries = le16_to_cpu(adapter->logmsg.retry);
 
        if (tx_retries > 75)
                tx_qual = (90 - tx_retries) * POOR / 15;
@@ -1131,10 +1131,10 @@ static struct iw_statistics *wlan_get_wireless_stats(struct net_device *dev)
                    (PERFECT - VERY_GOOD) / 50 + VERY_GOOD;
        quality = min(quality, tx_qual);
 
-       priv->wstats.discard.code = adapter->logmsg.wepundecryptable;
-       priv->wstats.discard.fragment = adapter->logmsg.rxfrag;
+       priv->wstats.discard.code = le16_to_cpu(adapter->logmsg.wepundecryptable);
+       priv->wstats.discard.fragment = le16_to_cpu(adapter->logmsg.rxfrag);
        priv->wstats.discard.retries = tx_retries;
-       priv->wstats.discard.misc = adapter->logmsg.ackfailure;
+       priv->wstats.discard.misc = le16_to_cpu(adapter->logmsg.ackfailure);
 
        /* Calculate quality */
        priv->wstats.qual.qual = max(quality, (u32)100);