[PATCH] libertas: fix mixed-case abuse in cmd_ds_802_11_ad_hoc_result

[linux-2.6-omap-h63xx.git] / drivers / net / wireless / libertas / hostcmd.h

diff --git a/drivers/net/wireless/libertas/hostcmd.h b/drivers/net/wireless/libertas/hostcmd.h
index 09b898f6719c2193d8d9dfe14d9b124b94154911..6b5e58c88c4e8777b97d26fc2e4f32a7ee653d3f 100644 (file)
--- a/drivers/net/wireless/libertas/hostcmd.h
+++ b/drivers/net/wireless/libertas/hostcmd.h
@@ -83,23 +83,12 @@ struct cmd_ctrl_node {
        wait_queue_head_t cmdwait_q;
 };
 
-/* WLAN_802_11_KEY
- *
- * Generic structure to hold all key types.  key type (WEP40, WEP104, TKIP, AES)
- * is determined from the keylength field.
- */
-struct WLAN_802_11_KEY {
-       __le32 len;
-       __le32 flags;  /* KEY_INFO_* from wlan_defs.h */
-       u8 key[MRVL_MAX_KEY_WPA_KEY_LENGTH];
-       __le16 type; /* KEY_TYPE_* from wlan_defs.h */
-};
-
-struct IE_WPA {
-       u8 elementid;
-       u8 len;
-       u8 oui[4];
-       __le16 version;
+/* Generic structure to hold all key types. */
+struct enc_key {
+       u16 len;
+       u16 flags;  /* KEY_INFO_* from wlan_defs.h */
+       u16 type; /* KEY_TYPE_* from wlan_defs.h */
+       u8 key[32];
 };
 
 /* wlan_offset_value */
@@ -108,18 +97,6 @@ struct wlan_offset_value {
        u32 value;
 };
 
-struct WLAN_802_11_FIXED_IEs {
-       __le64 timestamp;
-       __le16 beaconinterval;
-       u16 capabilities; /* Actually struct ieeetypes_capinfo */
-};
-
-struct WLAN_802_11_VARIABLE_IEs {
-       u8 elementid;
-       u8 length;
-       u8 data[1];
-};
-
 /* Define general data structure */
 /* cmd_DS_GEN */
 struct cmd_ds_gen {
@@ -182,7 +159,7 @@ struct cmd_ds_802_11_subscribe_event {
  */
 struct cmd_ds_802_11_scan {
        u8 bsstype;
-       u8 BSSID[ETH_ALEN];
+       u8 bssid[ETH_ALEN];
        u8 tlvbuffer[1];
 #if 0
        mrvlietypes_ssidparamset_t ssidParamSet;
@@ -237,7 +214,7 @@ struct cmd_ds_802_11_deauthenticate {
 
 struct cmd_ds_802_11_associate {
        u8 peerstaaddr[6];
-       struct ieeetypes_capinfo capinfo;
+       __le16 capability;
        __le16 listeninterval;
        __le16 bcnperiod;
        u8 dtimperiod;
@@ -260,8 +237,8 @@ struct cmd_ds_802_11_associate_rsp {
 };
 
 struct cmd_ds_802_11_ad_hoc_result {
-       u8 PAD[3];
-       u8 BSSID[ETH_ALEN];
+       u8 pad[3];
+       u8 bssid[ETH_ALEN];
 };
 
 struct cmd_ds_802_11_set_wep {
@@ -469,22 +446,22 @@ struct cmd_ds_802_11_ad_hoc_start {
        union IEEEtypes_ssparamset ssparamset;
        union ieeetypes_phyparamset phyparamset;
        __le16 probedelay;
-       struct ieeetypes_capinfo cap;
+       __le16 capability;
        u8 datarate[G_SUPPORTED_RATES];
        u8 tlv_memory_size_pad[100];
 } __attribute__ ((packed));
 
 struct adhoc_bssdesc {
-       u8 BSSID[6];
-       u8 SSID[32];
-       u8 bsstype;
+       u8 bssid[6];
+       u8 ssid[32];
+       u8 type;
        __le16 beaconperiod;
        u8 dtimperiod;
        __le64 timestamp;
        __le64 localtime;
        union ieeetypes_phyparamset phyparamset;
        union IEEEtypes_ssparamset ssparamset;
-       struct ieeetypes_capinfo cap;
+       __le16 capability;
        u8 datarates[G_SUPPORTED_RATES];
 
        /* DO NOT ADD ANY FIELDS TO THIS STRUCTURE. It is used below in the
@@ -494,7 +471,7 @@ struct adhoc_bssdesc {
 } __attribute__ ((packed));
 
 struct cmd_ds_802_11_ad_hoc_join {
-       struct adhoc_bssdesc bssdescriptor;
+       struct adhoc_bssdesc bss;
        __le16 failtimeout;
        __le16 probedelay;