diff options
author | Dan Williams | 2007-08-02 16:43:44 +0200 |
---|---|---|
committer | David S. Miller | 2007-10-11 01:49:38 +0200 |
commit | 0c9ca690e0117e1bf415d5f3e392e27c0c472c68 (patch) | |
tree | 8d8fcda57684b0b124d527bace187f526caa2c6f /drivers/net/wireless/libertas/types.h | |
parent | [PATCH] dev->priv to netdev_priv(dev), for drivers/net/wireless (diff) | |
download | kernel-qcow2-linux-0c9ca690e0117e1bf415d5f3e392e27c0c472c68.tar.gz kernel-qcow2-linux-0c9ca690e0117e1bf415d5f3e392e27c0c472c68.tar.xz kernel-qcow2-linux-0c9ca690e0117e1bf415d5f3e392e27c0c472c68.zip |
[PATCH] libertas: kill ieeetypes_capinfo bitfield, use ieee80211.h types
Use standard BSS capability field constants from ieee80211.h.
Signed-off-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/libertas/types.h')
-rw-r--r-- | drivers/net/wireless/libertas/types.h | 42 |
1 files changed, 1 insertions, 41 deletions
diff --git a/drivers/net/wireless/libertas/types.h b/drivers/net/wireless/libertas/types.h index 028e2f3b53d6..f4be1293cd16 100644 --- a/drivers/net/wireless/libertas/types.h +++ b/drivers/net/wireless/libertas/types.h @@ -30,47 +30,7 @@ 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; - u8 cfpollrqst:1; - u8 privacy:1; - u8 shortpreamble:1; - u8 pbcc:1; - u8 chanagility:1; - u8 spectrummgmt:1; - u8 rsrvd3:1; - u8 shortslottime:1; - u8 apsd:1; - u8 rsvrd2:1; - u8 dsssofdm:1; - u8 rsrvd1:2; -#endif -} __attribute__ ((packed)); struct ieeetypes_cfparamset { u8 elementid; @@ -114,7 +74,7 @@ union ieeetypes_phyparamset { } __attribute__ ((packed)); struct ieeetypes_assocrsp { - struct ieeetypes_capinfo capability; + __le16 capability; __le16 statuscode; __le16 aid; u8 iebuffer[1]; |