Skip to content

L
linux
Commit bd2de358 authored by Andres More's avatar Andres More Committed by Greg Kroah-Hartman
Browse files
Options

staging: vt6656: cleared checkpatch.pl findings in 80211hdr.h 

Code cleanup in:
	git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Findings were:
	do not use C99 // comments
	space required after that close brace '}'
	line over 80 characters
Signed-off-by: default avatarAndres More <more.andres@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 3dc1536b
Hide whitespace changes
Inline Side-by-side
Showing with 33 additions and 50 deletions
drivers/staging/vt6656/80211hdr.h
View file @ bd2de358
...@@ -16,16 +16,13 @@ ...@@ -16,16 +16,13 @@
* with this program; if not, write to the Free Software Foundation, Inc., * with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
* *
*
* File: 80211hdr.h * File: 80211hdr.h
* *
* Purpose: 802.11 MAC headers related pre-defines and macros. * Purpose: 802.11 MAC headers related pre-defines and macros.
* *
*
* Author: Lyndon Chen * Author: Lyndon Chen
* *
* Date: Apr 8, 2002 * Date: Apr 8, 2002
*
*/ */
#ifndef __80211HDR_H__ #ifndef __80211HDR_H__
...@@ -34,7 +31,8 @@ ...@@ -34,7 +31,8 @@
#include "ttype.h" #include "ttype.h"
/*--------------------- Export Definitions -------------------------*/ /*--------------------- Export Definitions -------------------------*/
// bit type
/* bit type */
#define BIT0 0x00000001 #define BIT0 0x00000001
#define BIT1 0x00000002 #define BIT1 0x00000002
#define BIT2 0x00000004 #define BIT2 0x00000004
...@@ -68,7 +66,7 @@ ...@@ -68,7 +66,7 @@
#define BIT30 0x40000000 #define BIT30 0x40000000
#define BIT31 0x80000000 #define BIT31 0x80000000
// 802.11 frame related, defined as 802.11 spec /* 802.11 frame related, defined as 802.11 spec */
#define WLAN_ADDR_LEN 6 #define WLAN_ADDR_LEN 6
#define WLAN_CRC_LEN 4 #define WLAN_CRC_LEN 4
#define WLAN_CRC32_LEN 4 #define WLAN_CRC32_LEN 4
...@@ -80,13 +78,14 @@ ...@@ -80,13 +78,14 @@
#define WLAN_HDR_ADDR4_LEN 30 #define WLAN_HDR_ADDR4_LEN 30
#define WLAN_IEHDR_LEN 2 #define WLAN_IEHDR_LEN 2
#define WLAN_SSID_MAXLEN 32 #define WLAN_SSID_MAXLEN 32
//#define WLAN_RATES_MAXLEN 255 /* #define WLAN_RATES_MAXLEN 255 */
#define WLAN_RATES_MAXLEN 16 #define WLAN_RATES_MAXLEN 16
#define WLAN_RATES_MAXLEN_11B 4 #define WLAN_RATES_MAXLEN_11B 4
#define WLAN_RSN_MAXLEN 32 #define WLAN_RSN_MAXLEN 32
#define WLAN_DATA_MAXLEN 2312 #define WLAN_DATA_MAXLEN 2312
#define WLAN_A3FR_MAXLEN (WLAN_HDR_ADDR3_LEN + WLAN_DATA_MAXLEN + WLAN_CRC_LEN) #define WLAN_A3FR_MAXLEN (WLAN_HDR_ADDR3_LEN \
+ WLAN_DATA_MAXLEN \
+ WLAN_CRC_LEN)
#define WLAN_BEACON_FR_MAXLEN WLAN_A3FR_MAXLEN #define WLAN_BEACON_FR_MAXLEN WLAN_A3FR_MAXLEN
#define WLAN_ATIM_FR_MAXLEN (WLAN_HDR_ADDR3_LEN + 0) #define WLAN_ATIM_FR_MAXLEN (WLAN_HDR_ADDR3_LEN + 0)
...@@ -101,12 +100,11 @@ ...@@ -101,12 +100,11 @@
#define WLAN_AUTHEN_FR_MAXLEN WLAN_A3FR_MAXLEN #define WLAN_AUTHEN_FR_MAXLEN WLAN_A3FR_MAXLEN
#define WLAN_DEAUTHEN_FR_MAXLEN (WLAN_HDR_ADDR3_LEN + 2) #define WLAN_DEAUTHEN_FR_MAXLEN (WLAN_HDR_ADDR3_LEN + 2)
#define WLAN_WEP_NKEYS 4 #define WLAN_WEP_NKEYS 4
#define WLAN_WEP40_KEYLEN 5 #define WLAN_WEP40_KEYLEN 5
#define WLAN_WEP104_KEYLEN 13 #define WLAN_WEP104_KEYLEN 13
#define WLAN_WEP232_KEYLEN 29 #define WLAN_WEP232_KEYLEN 29
//#define WLAN_WEPMAX_KEYLEN 29 /* #define WLAN_WEPMAX_KEYLEN 29 */
#define WLAN_WEPMAX_KEYLEN 32 #define WLAN_WEPMAX_KEYLEN 32
#define WLAN_CHALLENGE_IE_MAXLEN 255 #define WLAN_CHALLENGE_IE_MAXLEN 255
#define WLAN_CHALLENGE_IE_LEN 130 #define WLAN_CHALLENGE_IE_LEN 130
...@@ -115,7 +113,7 @@ ...@@ -115,7 +113,7 @@
#define WLAN_WEP_ICV_LEN 4 #define WLAN_WEP_ICV_LEN 4
#define WLAN_FRAGS_MAX 16 #define WLAN_FRAGS_MAX 16
// Frame Type /* Frame Type */
#define WLAN_TYPE_MGR 0x00 #define WLAN_TYPE_MGR 0x00
#define WLAN_TYPE_CTL 0x01 #define WLAN_TYPE_CTL 0x01
#define WLAN_TYPE_DATA 0x02 #define WLAN_TYPE_DATA 0x02
...@@ -124,8 +122,7 @@ ...@@ -124,8 +122,7 @@
#define WLAN_FTYPE_CTL 0x01 #define WLAN_FTYPE_CTL 0x01
#define WLAN_FTYPE_DATA 0x02 #define WLAN_FTYPE_DATA 0x02
/* Frame Subtypes */
// Frame Subtypes
#define WLAN_FSTYPE_ASSOCREQ 0x00 #define WLAN_FSTYPE_ASSOCREQ 0x00
#define WLAN_FSTYPE_ASSOCRESP 0x01 #define WLAN_FSTYPE_ASSOCRESP 0x01
#define WLAN_FSTYPE_REASSOCREQ 0x02 #define WLAN_FSTYPE_REASSOCREQ 0x02
...@@ -139,7 +136,7 @@ ...@@ -139,7 +136,7 @@
#define WLAN_FSTYPE_DEAUTHEN 0x0c #define WLAN_FSTYPE_DEAUTHEN 0x0c
#define WLAN_FSTYPE_ACTION 0x0d #define WLAN_FSTYPE_ACTION 0x0d
// Control /* Control */
#define WLAN_FSTYPE_PSPOLL 0x0a #define WLAN_FSTYPE_PSPOLL 0x0a
#define WLAN_FSTYPE_RTS 0x0b #define WLAN_FSTYPE_RTS 0x0b
#define WLAN_FSTYPE_CTS 0x0c #define WLAN_FSTYPE_CTS 0x0c
...@@ -147,7 +144,7 @@ ...@@ -147,7 +144,7 @@
#define WLAN_FSTYPE_CFEND 0x0e #define WLAN_FSTYPE_CFEND 0x0e
#define WLAN_FSTYPE_CFENDCFACK 0x0f #define WLAN_FSTYPE_CFENDCFACK 0x0f
// Data /* Data */
#define WLAN_FSTYPE_DATAONLY 0x00 #define WLAN_FSTYPE_DATAONLY 0x00
#define WLAN_FSTYPE_DATA_CFACK 0x01 #define WLAN_FSTYPE_DATA_CFACK 0x01
#define WLAN_FSTYPE_DATA_CFPOLL 0x02 #define WLAN_FSTYPE_DATA_CFPOLL 0x02
...@@ -157,13 +154,13 @@ ...@@ -157,13 +154,13 @@
#define WLAN_FSTYPE_CFPOLL 0x06 #define WLAN_FSTYPE_CFPOLL 0x06
#define WLAN_FSTYPE_CFACK_CFPOLL 0x07 #define WLAN_FSTYPE_CFACK_CFPOLL 0x07
#ifdef __BIG_ENDIAN #ifdef __BIG_ENDIAN
// GET & SET Frame Control bit /* GET & SET Frame Control bit */
#define WLAN_GET_FC_PRVER(n) ((((WORD)(n) >> 8) & (BIT0 | BIT1)) #define WLAN_GET_FC_PRVER(n) ((((WORD)(n) >> 8) & (BIT0 | BIT1))
#define WLAN_GET_FC_FTYPE(n) ((((WORD)(n) >> 8) & (BIT2 | BIT3)) >> 2) #define WLAN_GET_FC_FTYPE(n) ((((WORD)(n) >> 8) & (BIT2 | BIT3)) >> 2)
#define WLAN_GET_FC_FSTYPE(n) ((((WORD)(n) >> 8) & (BIT4|BIT5|BIT6|BIT7)) >> 4) #define WLAN_GET_FC_FSTYPE(n) ((((WORD)(n) >> 8) \
& (BIT4|BIT5|BIT6|BIT7)) >> 4)
#define WLAN_GET_FC_TODS(n) ((((WORD)(n) << 8) & (BIT8)) >> 8) #define WLAN_GET_FC_TODS(n) ((((WORD)(n) << 8) & (BIT8)) >> 8)
#define WLAN_GET_FC_FROMDS(n) ((((WORD)(n) << 8) & (BIT9)) >> 9) #define WLAN_GET_FC_FROMDS(n) ((((WORD)(n) << 8) & (BIT9)) >> 9)
#define WLAN_GET_FC_MOREFRAG(n) ((((WORD)(n) << 8) & (BIT10)) >> 10) #define WLAN_GET_FC_MOREFRAG(n) ((((WORD)(n) << 8) & (BIT10)) >> 10)
...@@ -173,12 +170,12 @@ ...@@ -173,12 +170,12 @@
#define WLAN_GET_FC_ISWEP(n) ((((WORD)(n) << 8) & (BIT14)) >> 14) #define WLAN_GET_FC_ISWEP(n) ((((WORD)(n) << 8) & (BIT14)) >> 14)
#define WLAN_GET_FC_ORDER(n) ((((WORD)(n) << 8) & (BIT15)) >> 15) #define WLAN_GET_FC_ORDER(n) ((((WORD)(n) << 8) & (BIT15)) >> 15)
// Sequence Field bit /* Sequence Field bit */
#define WLAN_GET_SEQ_FRGNUM(n) (((WORD)(n) >> 8) & (BIT0|BIT1|BIT2|BIT3)) #define WLAN_GET_SEQ_FRGNUM(n) (((WORD)(n) >> 8) & (BIT0|BIT1|BIT2|BIT3))
#define WLAN_GET_SEQ_SEQNUM(n) ((((WORD)(n) >> 8) & (~(BIT0|BIT1|BIT2|BIT3))) >> 4) #define WLAN_GET_SEQ_SEQNUM(n) ((((WORD)(n) >> 8) \
& (~(BIT0|BIT1|BIT2|BIT3))) >> 4)
// Capability Field bit /* Capability Field bit */
#define WLAN_GET_CAP_INFO_ESS(n) (((n) >> 8) & BIT0) #define WLAN_GET_CAP_INFO_ESS(n) (((n) >> 8) & BIT0)
#define WLAN_GET_CAP_INFO_IBSS(n) ((((n) >> 8) & BIT1) >> 1) #define WLAN_GET_CAP_INFO_IBSS(n) ((((n) >> 8) & BIT1) >> 1)
#define WLAN_GET_CAP_INFO_CFPOLLABLE(n) ((((n) >> 8) & BIT2) >> 2) #define WLAN_GET_CAP_INFO_CFPOLLABLE(n) ((((n) >> 8) & BIT2) >> 2)
...@@ -192,10 +189,9 @@ ...@@ -192,10 +189,9 @@
#define WLAN_GET_CAP_INFO_DSSSOFDM(n) ((((n)) & BIT13) >> 13) #define WLAN_GET_CAP_INFO_DSSSOFDM(n) ((((n)) & BIT13) >> 13)
#define WLAN_GET_CAP_INFO_GRPACK(n) ((((n)) & BIT14) >> 14) #define WLAN_GET_CAP_INFO_GRPACK(n) ((((n)) & BIT14) >> 14)
#else #else
// GET & SET Frame Control bit /* GET & SET Frame Control bit */
#define WLAN_GET_FC_PRVER(n) (((WORD)(n)) & (BIT0 | BIT1)) #define WLAN_GET_FC_PRVER(n) (((WORD)(n)) & (BIT0 | BIT1))
#define WLAN_GET_FC_FTYPE(n) ((((WORD)(n)) & (BIT2 | BIT3)) >> 2) #define WLAN_GET_FC_FTYPE(n) ((((WORD)(n)) & (BIT2 | BIT3)) >> 2)
#define WLAN_GET_FC_FSTYPE(n) ((((WORD)(n)) & (BIT4|BIT5|BIT6|BIT7)) >> 4) #define WLAN_GET_FC_FSTYPE(n) ((((WORD)(n)) & (BIT4|BIT5|BIT6|BIT7)) >> 4)
...@@ -208,13 +204,11 @@ ...@@ -208,13 +204,11 @@
#define WLAN_GET_FC_ISWEP(n) ((((WORD)(n)) & (BIT14)) >> 14) #define WLAN_GET_FC_ISWEP(n) ((((WORD)(n)) & (BIT14)) >> 14)
#define WLAN_GET_FC_ORDER(n) ((((WORD)(n)) & (BIT15)) >> 15) #define WLAN_GET_FC_ORDER(n) ((((WORD)(n)) & (BIT15)) >> 15)
/* Sequence Field bit */
// Sequence Field bit
#define WLAN_GET_SEQ_FRGNUM(n) (((WORD)(n)) & (BIT0|BIT1|BIT2|BIT3)) #define WLAN_GET_SEQ_FRGNUM(n) (((WORD)(n)) & (BIT0|BIT1|BIT2|BIT3))
#define WLAN_GET_SEQ_SEQNUM(n) ((((WORD)(n)) & (~(BIT0|BIT1|BIT2|BIT3))) >> 4) #define WLAN_GET_SEQ_SEQNUM(n) ((((WORD)(n)) & (~(BIT0|BIT1|BIT2|BIT3))) >> 4)
/* Capability Field bit */
// Capability Field bit
#define WLAN_GET_CAP_INFO_ESS(n) ((n) & BIT0) #define WLAN_GET_CAP_INFO_ESS(n) ((n) & BIT0)
#define WLAN_GET_CAP_INFO_IBSS(n) (((n) & BIT1) >> 1) #define WLAN_GET_CAP_INFO_IBSS(n) (((n) & BIT1) >> 1)
#define WLAN_GET_CAP_INFO_CFPOLLABLE(n) (((n) & BIT2) >> 2) #define WLAN_GET_CAP_INFO_CFPOLLABLE(n) (((n) & BIT2) >> 2)
...@@ -228,9 +222,7 @@ ...@@ -228,9 +222,7 @@
#define WLAN_GET_CAP_INFO_DSSSOFDM(n) (((n) & BIT13) >> 13) #define WLAN_GET_CAP_INFO_DSSSOFDM(n) (((n) & BIT13) >> 13)
#define WLAN_GET_CAP_INFO_GRPACK(n) (((n) & BIT14) >> 14) #define WLAN_GET_CAP_INFO_GRPACK(n) (((n) & BIT14) >> 14)
#endif /* #ifdef __BIG_ENDIAN */
#endif //#ifdef __BIG_ENDIAN
#define WLAN_SET_CAP_INFO_ESS(n) (n) #define WLAN_SET_CAP_INFO_ESS(n) (n)
#define WLAN_SET_CAP_INFO_IBSS(n) ((n) << 1) #define WLAN_SET_CAP_INFO_IBSS(n) ((n) << 1)
...@@ -245,7 +237,6 @@ ...@@ -245,7 +237,6 @@
#define WLAN_SET_CAP_INFO_DSSSOFDM(n) ((n) << 13) #define WLAN_SET_CAP_INFO_DSSSOFDM(n) ((n) << 13)
#define WLAN_SET_CAP_INFO_GRPACK(n) ((n) << 14) #define WLAN_SET_CAP_INFO_GRPACK(n) ((n) << 14)
#define WLAN_SET_FC_PRVER(n) ((WORD)(n)) #define WLAN_SET_FC_PRVER(n) ((WORD)(n))
#define WLAN_SET_FC_FTYPE(n) (((WORD)(n)) << 2) #define WLAN_SET_FC_FTYPE(n) (((WORD)(n)) << 2)
#define WLAN_SET_FC_FSTYPE(n) (((WORD)(n)) << 4) #define WLAN_SET_FC_FSTYPE(n) (((WORD)(n)) << 4)
...@@ -261,7 +252,7 @@ ...@@ -261,7 +252,7 @@
#define WLAN_SET_SEQ_FRGNUM(n) ((WORD)(n)) #define WLAN_SET_SEQ_FRGNUM(n) ((WORD)(n))
#define WLAN_SET_SEQ_SEQNUM(n) (((WORD)(n)) << 4) #define WLAN_SET_SEQ_SEQNUM(n) (((WORD)(n)) << 4)
// ERP Field bit /* ERP Field bit */
#define WLAN_GET_ERP_NONERP_PRESENT(n) ((n) & BIT0) #define WLAN_GET_ERP_NONERP_PRESENT(n) ((n) & BIT0)
#define WLAN_GET_ERP_USE_PROTECTION(n) (((n) & BIT1) >> 1) #define WLAN_GET_ERP_USE_PROTECTION(n) (((n) & BIT1) >> 1)
...@@ -271,21 +262,19 @@ ...@@ -271,21 +262,19 @@
#define WLAN_SET_ERP_USE_PROTECTION(n) ((n) << 1) #define WLAN_SET_ERP_USE_PROTECTION(n) ((n) << 1)
#define WLAN_SET_ERP_BARKER_MODE(n) ((n) << 2) #define WLAN_SET_ERP_BARKER_MODE(n) ((n) << 2)
/* Support & Basic Rates field */
// Support & Basic Rates field
#define WLAN_MGMT_IS_BASICRATE(b) ((b) & BIT7) #define WLAN_MGMT_IS_BASICRATE(b) ((b) & BIT7)
#define WLAN_MGMT_GET_RATE(b) ((b) & ~BIT7) #define WLAN_MGMT_GET_RATE(b) ((b) & ~BIT7)
// TIM field /* TIM field */
#define WLAN_MGMT_IS_MULTICAST_TIM(b) ((b) & BIT0) #define WLAN_MGMT_IS_MULTICAST_TIM(b) ((b) & BIT0)
#define WLAN_MGMT_GET_TIM_OFFSET(b) (((b) & ~BIT0) >> 1) #define WLAN_MGMT_GET_TIM_OFFSET(b) (((b) & ~BIT0) >> 1)
// 3-Addr & 4-Addr /* 3-Addr & 4-Addr */
#define WLAN_HDR_A3_DATA_PTR(p) (((PBYTE)(p)) + WLAN_HDR_ADDR3_LEN) #define WLAN_HDR_A3_DATA_PTR(p) (((PBYTE)(p)) + WLAN_HDR_ADDR3_LEN)
#define WLAN_HDR_A4_DATA_PTR(p) (((PBYTE)(p)) + WLAN_HDR_ADDR4_LEN) #define WLAN_HDR_A4_DATA_PTR(p) (((PBYTE)(p)) + WLAN_HDR_ADDR4_LEN)
// IEEE ADDR /* IEEE ADDR */
#define IEEE_ADDR_UNIVERSAL 0x02 #define IEEE_ADDR_UNIVERSAL 0x02
#define IEEE_ADDR_GROUP 0x01 #define IEEE_ADDR_GROUP 0x01
...@@ -293,7 +282,7 @@ typedef struct { ...@@ -293,7 +282,7 @@ typedef struct {
BYTE abyAddr[6]; BYTE abyAddr[6];
} IEEE_ADDR, *PIEEE_ADDR; } IEEE_ADDR, *PIEEE_ADDR;
// 802.11 Header Format /* 802.11 Header Format */
typedef struct tagWLAN_80211HDR_A2 { typedef struct tagWLAN_80211HDR_A2 {
...@@ -302,7 +291,7 @@ typedef struct tagWLAN_80211HDR_A2 { ...@@ -302,7 +291,7 @@ typedef struct tagWLAN_80211HDR_A2 {
BYTE abyAddr1[WLAN_ADDR_LEN]; BYTE abyAddr1[WLAN_ADDR_LEN];
BYTE abyAddr2[WLAN_ADDR_LEN]; BYTE abyAddr2[WLAN_ADDR_LEN];
}__attribute__ ((__packed__)) } __attribute__ ((__packed__))
WLAN_80211HDR_A2, *PWLAN_80211HDR_A2; WLAN_80211HDR_A2, *PWLAN_80211HDR_A2;
typedef struct tagWLAN_80211HDR_A3 { typedef struct tagWLAN_80211HDR_A3 {
...@@ -314,7 +303,7 @@ typedef struct tagWLAN_80211HDR_A3 { ...@@ -314,7 +303,7 @@ typedef struct tagWLAN_80211HDR_A3 {
BYTE abyAddr3[WLAN_ADDR_LEN]; BYTE abyAddr3[WLAN_ADDR_LEN];
WORD wSeqCtl; WORD wSeqCtl;
}__attribute__ ((__packed__)) } __attribute__ ((__packed__))
WLAN_80211HDR_A3, *PWLAN_80211HDR_A3; WLAN_80211HDR_A3, *PWLAN_80211HDR_A3;
typedef struct tagWLAN_80211HDR_A4 { typedef struct tagWLAN_80211HDR_A4 {
...@@ -327,10 +316,9 @@ typedef struct tagWLAN_80211HDR_A4 { ...@@ -327,10 +316,9 @@ typedef struct tagWLAN_80211HDR_A4 {
WORD wSeqCtl; WORD wSeqCtl;
BYTE abyAddr4[WLAN_ADDR_LEN]; BYTE abyAddr4[WLAN_ADDR_LEN];
}__attribute__ ((__packed__)) } __attribute__ ((__packed__))
WLAN_80211HDR_A4, *PWLAN_80211HDR_A4; WLAN_80211HDR_A4, *PWLAN_80211HDR_A4;
typedef union tagUWLAN_80211HDR { typedef union tagUWLAN_80211HDR {
WLAN_80211HDR_A2 sA2; WLAN_80211HDR_A2 sA2;
...@@ -339,15 +327,10 @@ typedef union tagUWLAN_80211HDR { ...@@ -339,15 +327,10 @@ typedef union tagUWLAN_80211HDR {
} UWLAN_80211HDR, *PUWLAN_80211HDR; } UWLAN_80211HDR, *PUWLAN_80211HDR;
/*--------------------- Export Classes ----------------------------*/ /*--------------------- Export Classes ----------------------------*/
/*--------------------- Export Variables --------------------------*/ /*--------------------- Export Variables --------------------------*/
/*--------------------- Export Functions --------------------------*/ /*--------------------- Export Functions --------------------------*/
#endif /* __80211HDR_H__ */
#endif // __80211HDR_H__
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7