openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Staging: wlan-ng: p80211hdr.h: Coding style cleanups 

Signed-off-by: Moritz Muehlenhoff <jmm@debian.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Moritz Muehlenhoff 2009-02-08 02:20:54 +01:00 committed by Greg Kroah-Hartman
parent ea75ad7b8b
commit d6c82d9719
1 changed files with 26 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
drivers/staging/wlan-ng/p80211hdr.h
View File

@ -126,7 +126,6 @@
#define WLAN_FSTYPE_CFPOLL 0x06 #define WLAN_FSTYPE_CFPOLL 0x06
#define WLAN_FSTYPE_CFACK_CFPOLL 0x07 #define WLAN_FSTYPE_CFACK_CFPOLL 0x07
/*================================================================*/ /*================================================================*/
/* Macros */ /* Macros */
@ -168,38 +167,32 @@
/* Generic 802.11 Header types */ /* Generic 802.11 Header types */
typedef struct p80211_hdr_a3 typedef struct p80211_hdr_a3 {
{ u16 fc;
u16 fc; u16 dur;
u16 dur; u8 a1[ETH_ALEN];
u8 a1[ETH_ALEN]; u8 a2[ETH_ALEN];
u8 a2[ETH_ALEN]; u8 a3[ETH_ALEN];
u8 a3[ETH_ALEN]; u16 seq;
u16 seq; } __attribute__ ((packed)) p80211_hdr_a3_t;
} __attribute__((packed)) p80211_hdr_a3_t;
typedef struct p80211_hdr_a4 typedef struct p80211_hdr_a4 {
{ u16 fc;
u16 fc; u16 dur;
u16 dur; u8 a1[ETH_ALEN];
u8 a1[ETH_ALEN]; u8 a2[ETH_ALEN];
u8 a2[ETH_ALEN]; u8 a3[ETH_ALEN];
u8 a3[ETH_ALEN]; u16 seq;
u16 seq; u8 a4[ETH_ALEN];
u8 a4[ETH_ALEN]; } __attribute__ ((packed)) p80211_hdr_a4_t;
} __attribute__((packed)) p80211_hdr_a4_t;
typedef union p80211_hdr typedef union p80211_hdr {
{ p80211_hdr_a3_t a3;
p80211_hdr_a3_t a3; p80211_hdr_a4_t a4;
p80211_hdr_a4_t a4; } __attribute__ ((packed)) p80211_hdr_t;
} __attribute__((packed)) p80211_hdr_t;
/*================================================================*/ /* Frame and header length macros */
/* Function Declarations */
/* Frame and header lenght macros */
#define WLAN_CTL_FRAMELEN(fstype) (\ #define WLAN_CTL_FRAMELEN(fstype) (\
(fstype) == WLAN_FSTYPE_BLOCKACKREQ ? 24 : \ (fstype) == WLAN_FSTYPE_BLOCKACKREQ ? 24 : \
@ -214,23 +207,22 @@ typedef union p80211_hdr
#define WLAN_FCS_LEN 4 #define WLAN_FCS_LEN 4
/* ftcl in HOST order */ /* ftcl in HOST order */
inline static u16 p80211_headerlen(u16 fctl) static inline u16 p80211_headerlen(u16 fctl)
{ {
u16 hdrlen = 0; u16 hdrlen = 0;
switch ( WLAN_GET_FC_FTYPE(fctl) ) { switch (WLAN_GET_FC_FTYPE(fctl)) {
case WLAN_FTYPE_MGMT: case WLAN_FTYPE_MGMT:
hdrlen = WLAN_HDR_A3_LEN; hdrlen = WLAN_HDR_A3_LEN;
break; break;
case WLAN_FTYPE_DATA: case WLAN_FTYPE_DATA:
hdrlen = WLAN_HDR_A3_LEN; hdrlen = WLAN_HDR_A3_LEN;
if ( WLAN_GET_FC_TODS(fctl) && WLAN_GET_FC_FROMDS(fctl) ) { if (WLAN_GET_FC_TODS(fctl) && WLAN_GET_FC_FROMDS(fctl))
hdrlen += ETH_ALEN; hdrlen += ETH_ALEN;
}
break; break;
case WLAN_FTYPE_CTL: case WLAN_FTYPE_CTL:
hdrlen = WLAN_CTL_FRAMELEN(WLAN_GET_FC_FSTYPE(fctl)) - hdrlen = WLAN_CTL_FRAMELEN(WLAN_GET_FC_FSTYPE(fctl)) -
WLAN_FCS_LEN; WLAN_FCS_LEN;
break; break;
default: default:
hdrlen = WLAN_HDR_A3_LEN; hdrlen = WLAN_HDR_A3_LEN;
@ -240,4 +232,3 @@ inline static u16 p80211_headerlen(u16 fctl)
} }
#endif /* _P80211HDR_H */ #endif /* _P80211HDR_H */