libertas: move to uniform lbs_/LBS_ namespace

[safe/jmp/linux-2.6] / drivers / net / wireless / libertas / hostcmd.h

diff --git a/drivers/net/wireless/libertas/hostcmd.h b/drivers/net/wireless/libertas/hostcmd.h
index e4fafbf..6477ce0 100644 (file)
--- a/drivers/net/wireless/libertas/hostcmd.h
+++ b/drivers/net/wireless/libertas/hostcmd.h
@@ -2,8 +2,8 @@
  * This file contains the function prototypes, data structure
  * and defines for all the host/station commands
  */
-#ifndef __HOSTCMD__H
-#define __HOSTCMD__H
+#ifndef _LBS_HOSTCMD_H
+#define _LBS_HOSTCMD_H
 
 #include <linux/wireless.h>
 #include "11d.h"
@@ -86,13 +86,13 @@ struct cmd_ctrl_node {
 /* 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 */
+       u16 flags;  /* KEY_INFO_* from defs.h */
+       u16 type; /* KEY_TYPE_* from defs.h */
        u8 key[32];
 };
 
-/* wlan_offset_value */
-struct wlan_offset_value {
+/* lbs_offset_value */
+struct lbs_offset_value {
        u32 offset;
        u32 value;
 };
@@ -108,7 +108,7 @@ struct cmd_ds_gen {
 
 #define S_DS_GEN sizeof(struct cmd_ds_gen)
 /*
- * Define data structure for cmd_get_hw_spec
+ * Define data structure for CMD_GET_HW_SPEC
  * This structure defines the response for the GET_HW_SPEC command
  */
 struct cmd_ds_get_hw_spec {
@@ -155,7 +155,7 @@ struct cmd_ds_802_11_subscribe_event {
 
 /*
  * This scan handle Country Information IE(802.11d compliant)
- * Define data structure for cmd_802_11_scan
+ * Define data structure for CMD_802_11_SCAN
  */
 struct cmd_ds_802_11_scan {
        u8 bsstype;
@@ -237,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 {
@@ -405,6 +405,16 @@ struct cmd_ds_802_11_rf_antenna {
 
 };
 
+struct cmd_ds_802_11_monitor_mode {
+       u16 action;
+       u16 mode;
+};
+
+struct cmd_ds_set_boot2_ver {
+       u16 action;
+       u16 version;
+};
+
 struct cmd_ds_802_11_ps_mode {
        __le16 action;
        __le16 nullpktinterval;
@@ -428,8 +438,8 @@ struct PS_CMD_ConfirmSleep {
 
 struct cmd_ds_802_11_data_rate {
        __le16 action;
-       __le16 reserverd;
-       u8 datarate[G_SUPPORTED_RATES];
+       __le16 reserved;
+       u8 rates[MAX_RATES];
 };
 
 struct cmd_ds_802_11_rate_adapt_rateset {
@@ -439,7 +449,7 @@ struct cmd_ds_802_11_rate_adapt_rateset {
 };
 
 struct cmd_ds_802_11_ad_hoc_start {
-       u8 SSID[IW_ESSID_MAX_SIZE];
+       u8 ssid[IW_ESSID_MAX_SIZE];
        u8 bsstype;
        __le16 beaconperiod;
        u8 dtimperiod;
@@ -447,7 +457,7 @@ struct cmd_ds_802_11_ad_hoc_start {
        union ieeetypes_phyparamset phyparamset;
        __le16 probedelay;
        __le16 capability;
-       u8 datarate[G_SUPPORTED_RATES];
+       u8 rates[MAX_RATES];
        u8 tlv_memory_size_pad[100];
 } __attribute__ ((packed));
 
@@ -462,7 +472,7 @@ struct adhoc_bssdesc {
        union ieeetypes_phyparamset phyparamset;
        union IEEEtypes_ssparamset ssparamset;
        __le16 capability;
-       u8 datarates[G_SUPPORTED_RATES];
+       u8 rates[MAX_RATES];
 
        /* DO NOT ADD ANY FIELDS TO THIS STRUCTURE. It is used below in the
         * Adhoc join command and will cause a binary layout mismatch with
@@ -623,6 +633,7 @@ struct cmd_ds_command {
                struct cmd_ds_802_11_snmp_mib smib;
                struct cmd_ds_802_11_rf_tx_power txp;
                struct cmd_ds_802_11_rf_antenna rant;
+               struct cmd_ds_802_11_monitor_mode monitor;
                struct cmd_ds_802_11_data_rate drate;
                struct cmd_ds_802_11_rate_adapt_rateset rateset;
                struct cmd_ds_mac_multicast_adr madr;
@@ -654,6 +665,7 @@ struct cmd_ds_command {
                struct cmd_ds_bt_access bt;
                struct cmd_ds_fwt_access fwt;
                struct cmd_ds_mesh_access mesh;
+               struct cmd_ds_set_boot2_ver boot2_ver;
                struct cmd_ds_get_tsf gettsf;
                struct cmd_ds_802_11_subscribe_event subscribe_event;
        } params;