libertas: change IW_ESSID_MAX_SIZE -> IEEE80211_MAX_SSID_LEN

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

diff --git a/drivers/net/wireless/libertas/types.h b/drivers/net/wireless/libertas/types.h
index de03b9c..3e72c86 100644 (file)
--- a/drivers/net/wireless/libertas/types.h
+++ b/drivers/net/wireless/libertas/types.h
@@ -5,12 +5,17 @@
 #define _LBS_TYPES_H_
 
 #include <linux/if_ether.h>
+#include <linux/ieee80211.h>
 #include <asm/byteorder.h>
-#include <linux/wireless.h>
 
-struct ieeetypes_cfparamset {
-       u8 elementid;
+struct ieee_ie_header {
+       u8 id;
        u8 len;
+} __attribute__ ((packed));
+
+struct ieee_ie_cf_param_set {
+       struct ieee_ie_header header;
+
        u8 cfpcnt;
        u8 cfpperiod;
        __le16 cfpmaxduration;
@@ -18,42 +23,35 @@ struct ieeetypes_cfparamset {
 } __attribute__ ((packed));
 
 
-struct ieeetypes_ibssparamset {
-       u8 elementid;
-       u8 len;
+struct ieee_ie_ibss_param_set {
+       struct ieee_ie_header header;
+
        __le16 atimwindow;
 } __attribute__ ((packed));
 
-union IEEEtypes_ssparamset {
-       struct ieeetypes_cfparamset cfparamset;
-       struct ieeetypes_ibssparamset ibssparamset;
+union ieee_ss_param_set {
+       struct ieee_ie_cf_param_set cf;
+       struct ieee_ie_ibss_param_set ibss;
 } __attribute__ ((packed));
 
-struct ieeetypes_fhparamset {
-       u8 elementid;
-       u8 len;
+struct ieee_ie_fh_param_set {
+       struct ieee_ie_header header;
+
        __le16 dwelltime;
        u8 hopset;
        u8 hoppattern;
        u8 hopindex;
 } __attribute__ ((packed));
 
-struct ieeetypes_dsparamset {
-       u8 elementid;
-       u8 len;
-       u8 currentchan;
-} __attribute__ ((packed));
+struct ieee_ie_ds_param_set {
+       struct ieee_ie_header header;
 
-union ieeetypes_phyparamset {
-       struct ieeetypes_fhparamset fhparamset;
-       struct ieeetypes_dsparamset dsparamset;
+       u8 channel;
 } __attribute__ ((packed));
 
-struct ieeetypes_assocrsp {
-       __le16 capability;
-       __le16 statuscode;
-       __le16 aid;
-       u8 iebuffer[1];
+union ieee_phy_param_set {
+       struct ieee_ie_fh_param_set fh;
+       struct ieee_ie_ds_param_set ds;
 } __attribute__ ((packed));
 
 /** TLV  type ID definition */
@@ -94,32 +92,33 @@ struct ieeetypes_assocrsp {
 #define TLV_TYPE_TSFTIMESTAMP      (PROPRIETARY_TLV_BASE_ID + 19)
 #define TLV_TYPE_RSSI_HIGH          (PROPRIETARY_TLV_BASE_ID + 22)
 #define TLV_TYPE_SNR_HIGH           (PROPRIETARY_TLV_BASE_ID + 23)
+#define TLV_TYPE_AUTH_TYPE          (PROPRIETARY_TLV_BASE_ID + 31)
 #define TLV_TYPE_MESH_ID            (PROPRIETARY_TLV_BASE_ID + 37)
 #define TLV_TYPE_OLD_MESH_ID        (PROPRIETARY_TLV_BASE_ID + 291)
 
 /** TLV related data structures*/
-struct mrvlietypesheader {
+struct mrvl_ie_header {
        __le16 type;
        __le16 len;
 } __attribute__ ((packed));
 
-struct mrvlietypes_data {
-       struct mrvlietypesheader header;
+struct mrvl_ie_data {
+       struct mrvl_ie_header header;
        u8 Data[1];
 } __attribute__ ((packed));
 
-struct mrvlietypes_ratesparamset {
-       struct mrvlietypesheader header;
+struct mrvl_ie_rates_param_set {
+       struct mrvl_ie_header header;
        u8 rates[1];
 } __attribute__ ((packed));
 
-struct mrvlietypes_ssidparamset {
-       struct mrvlietypesheader header;
+struct mrvl_ie_ssid_param_set {
+       struct mrvl_ie_header header;
        u8 ssid[1];
 } __attribute__ ((packed));
 
-struct mrvlietypes_wildcardssidparamset {
-       struct mrvlietypesheader header;
+struct mrvl_ie_wildcard_ssid_param_set {
+       struct mrvl_ie_header header;
        u8 MaxSsidlength;
        u8 ssid[1];
 } __attribute__ ((packed));
@@ -144,91 +143,72 @@ struct chanscanparamset {
        __le16 maxscantime;
 } __attribute__ ((packed));
 
-struct mrvlietypes_chanlistparamset {
-       struct mrvlietypesheader header;
+struct mrvl_ie_chanlist_param_set {
+       struct mrvl_ie_header header;
        struct chanscanparamset chanscanparam[1];
 } __attribute__ ((packed));
 
-struct cfparamset {
+struct mrvl_ie_cf_param_set {
+       struct mrvl_ie_header header;
        u8 cfpcnt;
        u8 cfpperiod;
        __le16 cfpmaxduration;
        __le16 cfpdurationremaining;
 } __attribute__ ((packed));
 
-struct ibssparamset {
-       __le16 atimwindow;
-} __attribute__ ((packed));
-
-struct mrvlietypes_ssparamset {
-       struct mrvlietypesheader header;
-       union {
-               struct cfparamset cfparamset[1];
-               struct ibssparamset ibssparamset[1];
-       } cf_ibss;
+struct mrvl_ie_ds_param_set {
+       struct mrvl_ie_header header;
+       u8 channel;
 } __attribute__ ((packed));
 
-struct fhparamset {
-       __le16 dwelltime;
-       u8 hopset;
-       u8 hoppattern;
-       u8 hopindex;
-} __attribute__ ((packed));
-
-struct dsparamset {
-       u8 currentchan;
-} __attribute__ ((packed));
-
-struct mrvlietypes_phyparamset {
-       struct mrvlietypesheader header;
-       union {
-               struct fhparamset fhparamset[1];
-               struct dsparamset dsparamset[1];
-       } fh_ds;
-} __attribute__ ((packed));
-
-struct mrvlietypes_rsnparamset {
-       struct mrvlietypesheader header;
+struct mrvl_ie_rsn_param_set {
+       struct mrvl_ie_header header;
        u8 rsnie[1];
 } __attribute__ ((packed));
 
-struct mrvlietypes_tsftimestamp {
-       struct mrvlietypesheader header;
+struct mrvl_ie_tsf_timestamp {
+       struct mrvl_ie_header header;
        __le64 tsftable[1];
 } __attribute__ ((packed));
 
+/* v9 and later firmware only */
+struct mrvl_ie_auth_type {
+       struct mrvl_ie_header header;
+       __le16 auth;
+} __attribute__ ((packed));
+
 /**  Local Power capability */
-struct mrvlietypes_powercapability {
-       struct mrvlietypesheader header;
+struct mrvl_ie_power_capability {
+       struct mrvl_ie_header header;
        s8 minpower;
        s8 maxpower;
 } __attribute__ ((packed));
 
 /* used in CMD_802_11_SUBSCRIBE_EVENT for SNR, RSSI and Failure */
-struct mrvlietypes_thresholds {
-       struct mrvlietypesheader header;
+struct mrvl_ie_thresholds {
+       struct mrvl_ie_header header;
        u8 value;
        u8 freq;
 } __attribute__ ((packed));
 
-struct mrvlietypes_beaconsmissed {
-       struct mrvlietypesheader header;
+struct mrvl_ie_beacons_missed {
+       struct mrvl_ie_header header;
        u8 beaconmissed;
        u8 reserved;
 } __attribute__ ((packed));
 
-struct mrvlietypes_numprobes {
-       struct mrvlietypesheader header;
+struct mrvl_ie_num_probes {
+       struct mrvl_ie_header header;
        __le16 numprobes;
 } __attribute__ ((packed));
 
-struct mrvlietypes_bcastprobe {
-       struct mrvlietypesheader header;
+struct mrvl_ie_bcast_probe {
+       struct mrvl_ie_header header;
        __le16 bcastprobe;
 } __attribute__ ((packed));
 
-struct mrvlietypes_numssidprobe {
-       struct mrvlietypesheader header;
+struct mrvl_ie_num_ssid_probe {
+       struct mrvl_ie_header header;
        __le16 numssidprobe;
 } __attribute__ ((packed));
 
@@ -237,8 +217,8 @@ struct led_pin {
        u8 pin;
 } __attribute__ ((packed));
 
-struct mrvlietypes_ledgpio {
-       struct mrvlietypesheader header;
+struct mrvl_ie_ledgpio {
+       struct mrvl_ie_header header;
        struct led_pin ledpin[1];
 } __attribute__ ((packed));
 
@@ -250,8 +230,8 @@ struct led_bhv {
 } __attribute__ ((packed));
 
 
-struct mrvlietypes_ledbhv {
-       struct mrvlietypesheader header;
+struct mrvl_ie_ledbhv {
+       struct mrvl_ie_header header;
        struct led_bhv ledbhv[1];
 } __attribute__ ((packed));
 
@@ -267,7 +247,7 @@ struct mrvl_meshie_val {
        uint8_t active_metric_id;
        uint8_t mesh_capability;
        uint8_t mesh_id_len;
-       uint8_t mesh_id[IW_ESSID_MAX_SIZE];
+       uint8_t mesh_id[IEEE80211_MAX_SSID_LEN];
 } __attribute__ ((packed));
 
 struct mrvl_meshie {