Staging: wlan-ng: p80211hdr.h: Coding style cleanups (d6c82d97) · Commits · 戴 / test

drivers/staging/wlan-ng/p80211hdr.h

+30 −39

Original line number	Diff line number	Diff line
		@@ -126,7 +126,6 @@
		#define WLAN_FSTYPE_CFPOLL 0x06
		#define WLAN_FSTYPE_CFACK_CFPOLL 0x07


		/================================================================/
		/* Macros */

		@@ -168,8 +167,7 @@

		/* Generic 802.11 Header types */

		typedef struct p80211_hdr_a3
		{
		typedef struct p80211_hdr_a3 {
		u16 fc;
		u16 dur;
		u8 a1[ETH_ALEN];
		@@ -178,8 +176,7 @@ typedef struct p80211_hdr_a3
		u16 seq;
		} __attribute__ ((packed)) p80211_hdr_a3_t;

		typedef struct p80211_hdr_a4
		{
		typedef struct p80211_hdr_a4 {
		u16 fc;
		u16 dur;
		u8 a1[ETH_ALEN];
		@@ -189,17 +186,13 @@ typedef struct p80211_hdr_a4
		u8 a4[ETH_ALEN];
		} __attribute__ ((packed)) p80211_hdr_a4_t;

		typedef union p80211_hdr
		{
		typedef union p80211_hdr {
		p80211_hdr_a3_t a3;
		p80211_hdr_a4_t a4;
		} __attribute__ ((packed)) p80211_hdr_t;


		/================================================================/
		/* Function Declarations */

		/* Frame and header lenght macros */
		/* Frame and header length macros */

		#define WLAN_CTL_FRAMELEN(fstype) (\
		(fstype) == WLAN_FSTYPE_BLOCKACKREQ ? 24 : \
		@@ -214,7 +207,7 @@ typedef union p80211_hdr
		#define WLAN_FCS_LEN 4

		/* ftcl in HOST order */
		inline static u16 p80211_headerlen(u16 fctl)
		static inline u16 p80211_headerlen(u16 fctl)
		{
		u16 hdrlen = 0;

		@@ -224,9 +217,8 @@ inline static u16 p80211_headerlen(u16 fctl)
		break;
		case WLAN_FTYPE_DATA:
		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;
		}
		break;
		case WLAN_FTYPE_CTL:
		hdrlen = WLAN_CTL_FRAMELEN(WLAN_GET_FC_FSTYPE(fctl)) -
		@@ -240,4 +232,3 @@ inline static u16 p80211_headerlen(u16 fctl)
		}

		#endif /* _P80211HDR_H */

Admin message