lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Staging: winbond: fix brace and space coding style issue in mac_structures.h

Browse Source 
This is a patch to the mac_structures.h file that fixed up a brace and
space Errors found by the checkpatch.pl tool.

Signed-off-by: Ruslan Pisarev <ruslan@rpisarev.org.ua>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Ruslan Pisarev
2010-03-20 16:46:35 +02:00
committed by Greg Kroah-Hartman
parent 03a4389c80
commit d20279d7d4
1 changed files with 68 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
drivers/staging/winbond/mac_structures.h
View File

@@ -180,8 +180,7 @@ enum enum_MMPDUResultCode
// Define the transmission constants based on W89C32 MAC // Define the transmission constants based on W89C32 MAC
// target specification. // target specification.
//===========================================================*/ //===========================================================*/
typedef enum enum_TxRate typedef enum enum_TxRate {
{
TXRATE_1M = 0, TXRATE_1M = 0,
TXRATE_2MLONG = 2, TXRATE_2MLONG = 2,
TXRATE_2MSHORT = 3, TXRATE_2MSHORT = 3,
@@ -238,14 +237,11 @@ typedef enum enum_TxRate
#define CAPABILITY_DSSS_OFDM_BIT 0x2000 #define CAPABILITY_DSSS_OFDM_BIT 0x2000
struct Capability_Information_Element struct Capability_Information_Element {
{ union {
union
{
u16 __attribute__ ((packed)) wValue; u16 __attribute__ ((packed)) wValue;
#ifdef _BIG_ENDIAN_ /* 20060926 add by anson's endian */ #ifdef _BIG_ENDIAN_ /* 20060926 add by anson's endian */
struct _Capability struct _Capability {
{
/* -- 11G -- */ /* -- 11G -- */
u8 Reserved3:2; u8 Reserved3:2;
u8 DSSS_OFDM:1; u8 DSSS_OFDM:1;
@@ -262,8 +258,7 @@ struct Capability_Information_Element
u8 ESS:1; u8 ESS:1;
} __attribute__ ((packed)) Capability; } __attribute__ ((packed)) Capability;
#else #else
struct _Capability struct _Capability {
{
u8 ESS:1; u8 ESS:1;
u8 IBSS:1; u8 IBSS:1;
u8 CF_Pollable:1; u8 CF_Pollable:1;
@@ -283,8 +278,7 @@ struct Capability_Information_Element
} __attribute__ ((packed)) ; } __attribute__ ((packed)) ;
} __attribute__ ((packed)); } __attribute__ ((packed));
struct FH_Parameter_Set_Element struct FH_Parameter_Set_Element {
{
u8 Element_ID; u8 Element_ID;
u8 Length; u8 Length;
u8 Dwell_Time[2]; u8 Dwell_Time[2];
@@ -293,29 +287,25 @@ struct FH_Parameter_Set_Element
u8 Hop_Index; u8 Hop_Index;
}; };
struct DS_Parameter_Set_Element struct DS_Parameter_Set_Element {
{
u8 Element_ID; u8 Element_ID;
u8 Length; u8 Length;
u8 Current_Channel; u8 Current_Channel;
}; };
struct Supported_Rates_Element struct Supported_Rates_Element {
{
u8 Element_ID; u8 Element_ID;
u8 Length; u8 Length;
u8 SupportedRates[8]; u8 SupportedRates[8];
} __attribute__ ((packed)); } __attribute__ ((packed));
struct SSID_Element struct SSID_Element {
{
u8 Element_ID; u8 Element_ID;
u8 Length; u8 Length;
u8 SSID[32]; u8 SSID[32];
} __attribute__ ((packed)) ; } __attribute__ ((packed)) ;
struct CF_Parameter_Set_Element struct CF_Parameter_Set_Element {
{
u8 Element_ID; u8 Element_ID;
u8 Length; u8 Length;
u8 CFP_Count; u8 CFP_Count;
@@ -324,8 +314,7 @@ struct CF_Parameter_Set_Element
u8 CFP_DurRemaining[2]; /* in time units */ u8 CFP_DurRemaining[2]; /* in time units */
}; };
struct TIM_Element struct TIM_Element {
{
u8 Element_ID; u8 Element_ID;
u8 Length; u8 Length;
u8 DTIM_Count; u8 DTIM_Count;
@@ -334,22 +323,19 @@ struct TIM_Element
u8 Partial_Virtual_Bitmap[251]; u8 Partial_Virtual_Bitmap[251];
}; };
struct IBSS_Parameter_Set_Element struct IBSS_Parameter_Set_Element {
{
u8 Element_ID; u8 Element_ID;
u8 Length; u8 Length;
u8 ATIM_Window[2]; u8 ATIM_Window[2];
}; };
struct Challenge_Text_Element struct Challenge_Text_Element {
{
u8 Element_ID; u8 Element_ID;
u8 Length; u8 Length;
u8 Challenge_Text[253]; u8 Challenge_Text[253];
}; };
struct PHY_Parameter_Set_Element struct PHY_Parameter_Set_Element {
{
/* int aSlotTime; */ /* int aSlotTime; */
/* int aSifsTime; */ /* int aSifsTime; */
s32 aCCATime; s32 aCCATime;
@@ -372,8 +358,7 @@ struct PHY_Parameter_Set_Element
}; };
/* -- 11G -- */ /* -- 11G -- */
struct ERP_Information_Element struct ERP_Information_Element {
{
u8 Element_ID; u8 Element_ID;
u8 Length; u8 Length;
#ifdef _BIG_ENDIAN_ /* 20060926 add by anson's endian */ #ifdef _BIG_ENDIAN_ /* 20060926 add by anson's endian */
@@ -389,8 +374,7 @@ struct ERP_Information_Element
#endif #endif
}; };
struct Extended_Supported_Rates_Element struct Extended_Supported_Rates_Element {
{
u8 Element_ID; u8 Element_ID;
u8 Length; u8 Length;
u8 ExtendedSupportedRates[255]; u8 ExtendedSupportedRates[255];
@@ -587,13 +571,11 @@ struct Data_Frame {
/* FCS */ /* FCS */
} __attribute__ ((packed)); } __attribute__ ((packed));
struct Disassociation_Frame_Body struct Disassociation_Frame_Body {
{
u16 reasonCode; u16 reasonCode;
} __attribute__ ((packed)); } __attribute__ ((packed));
struct Association_Request_Frame_Body struct Association_Request_Frame_Body {
{
u16 capability_information; u16 capability_information;
u16 listenInterval; u16 listenInterval;
u8 Current_AP_Address[MAC_ADDR_LENGTH];/* for reassociation only */ u8 Current_AP_Address[MAC_ADDR_LENGTH];/* for reassociation only */
@@ -601,8 +583,7 @@ struct Association_Request_Frame_Body
/* Supported_Rates (2+8 bytes) */ /* Supported_Rates (2+8 bytes) */
} __attribute__ ((packed)); } __attribute__ ((packed));
struct Association_Response_Frame_Body struct Association_Response_Frame_Body {
{
u16 capability_information; u16 capability_information;
u16 statusCode; u16 statusCode;
u16 Association_ID; u16 Association_ID;
@@ -619,22 +600,19 @@ struct Association_Response_Frame_Body
};*/ };*/
/* eliminated by WS 07/22/04 comboined with associateion request frame. */ /* eliminated by WS 07/22/04 comboined with associateion request frame. */
struct Reassociation_Response_Frame_Body struct Reassociation_Response_Frame_Body {
{
u16 capability_information; u16 capability_information;
u16 statusCode; u16 statusCode;
u16 Association_ID; u16 Association_ID;
struct Supported_Rates_Element supportedRates; struct Supported_Rates_Element supportedRates;
} __attribute__ ((packed)); } __attribute__ ((packed));
struct Deauthentication_Frame_Body struct Deauthentication_Frame_Body {
{
u16 reasonCode; u16 reasonCode;
} __attribute__ ((packed)); } __attribute__ ((packed));
struct Probe_Response_Frame_Body struct Probe_Response_Frame_Body {
{
u16 Timestamp; u16 Timestamp;
u16 Beacon_Interval; u16 Beacon_Interval;
u16 Capability_Information; u16 Capability_Information;
@@ -645,8 +623,7 @@ struct Probe_Response_Frame_Body
// IBSS parameter Set */ // IBSS parameter Set */
} __attribute__ ((packed)); } __attribute__ ((packed));
struct Authentication_Frame_Body struct Authentication_Frame_Body {
{
u16 algorithmNumber; u16 algorithmNumber;
u16 sequenceNumber; u16 sequenceNumber;
u16 statusCode; u16 statusCode;