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

staging: vt6655: fix braces at newline for structs 

For structs definitions, the braces should be at the end of the
line. Reported by checkpatch.

Signed-off-by: Guillaume Clement <gclement@baobob.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Guillaume Clement 2014-07-25 01:06:19 +02:00 committed by Greg Kroah-Hartman
parent 84b5076207
commit b69ee55b4c
4 changed files with 13 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/staging/vt6655/bssdb.h
View File

@ -69,8 +69,7 @@
// IEEE 802.11 Structures and definitions // IEEE 802.11 Structures and definitions
// //
typedef enum _NDIS_802_11_NETWORK_TYPE typedef enum _NDIS_802_11_NETWORK_TYPE {
{
Ndis802_11FH, Ndis802_11FH,
Ndis802_11DS, Ndis802_11DS,
Ndis802_11OFDM5, Ndis802_11OFDM5,

15
drivers/staging/vt6655/device.h
View File

@ -201,8 +201,7 @@ typedef enum __device_init_type {
// PMKID Structures // PMKID Structures
typedef unsigned char NDIS_802_11_PMKID_VALUE[16]; typedef unsigned char NDIS_802_11_PMKID_VALUE[16];
typedef enum _NDIS_802_11_WEP_STATUS typedef enum _NDIS_802_11_WEP_STATUS {
{
Ndis802_11WEPEnabled, Ndis802_11WEPEnabled,
Ndis802_11Encryption1Enabled = Ndis802_11WEPEnabled, Ndis802_11Encryption1Enabled = Ndis802_11WEPEnabled,
Ndis802_11WEPDisabled, Ndis802_11WEPDisabled,
@ -218,8 +217,7 @@ typedef enum _NDIS_802_11_WEP_STATUS
} NDIS_802_11_WEP_STATUS, *PNDIS_802_11_WEP_STATUS, } NDIS_802_11_WEP_STATUS, *PNDIS_802_11_WEP_STATUS,
NDIS_802_11_ENCRYPTION_STATUS, *PNDIS_802_11_ENCRYPTION_STATUS; NDIS_802_11_ENCRYPTION_STATUS, *PNDIS_802_11_ENCRYPTION_STATUS;
typedef enum _NDIS_802_11_STATUS_TYPE typedef enum _NDIS_802_11_STATUS_TYPE {
{
Ndis802_11StatusType_Authentication, Ndis802_11StatusType_Authentication,
Ndis802_11StatusType_MediaStreamMode, Ndis802_11StatusType_MediaStreamMode,
Ndis802_11StatusType_PMKID_CandidateList, Ndis802_11StatusType_PMKID_CandidateList,
@ -232,8 +230,7 @@ struct pmkid_candidate {
unsigned long Flags; unsigned long Flags;
}; };
typedef struct _BSSID_INFO typedef struct _BSSID_INFO {
{
NDIS_802_11_MAC_ADDRESS BSSID; NDIS_802_11_MAC_ADDRESS BSSID;
NDIS_802_11_PMKID_VALUE PMKID; NDIS_802_11_PMKID_VALUE PMKID;
} BSSID_INFO, *PBSSID_INFO; } BSSID_INFO, *PBSSID_INFO;
@ -293,8 +290,7 @@ typedef struct tagSCache {
#define CB_MAX_RX_FRAG 64 #define CB_MAX_RX_FRAG 64
// DeFragment Control Block, used for collecting fragments prior to reassembly // DeFragment Control Block, used for collecting fragments prior to reassembly
typedef struct tagSDeFragControlBlock typedef struct tagSDeFragControlBlock {
{
unsigned short wSequence; unsigned short wSequence;
unsigned short wFragNum; unsigned short wFragNum;
unsigned char abyAddr2[ETH_ALEN]; unsigned char abyAddr2[ETH_ALEN];
@ -334,8 +330,7 @@ typedef struct tagSDeFragControlBlock
//PLICE_DEBUG-> //PLICE_DEBUG->
typedef struct _RxManagementQueue typedef struct _RxManagementQueue {
{
int packet_num; int packet_num;
int head, tail; int head, tail;
PSRxMgmtPacket Q[NUM]; PSRxMgmtPacket Q[NUM];

9
drivers/staging/vt6655/key.h
View File

@ -53,8 +53,7 @@
#define KEY_CTL_CCMP 0x03 #define KEY_CTL_CCMP 0x03
#define KEY_CTL_INVALID 0xFF #define KEY_CTL_INVALID 0xFF
typedef struct tagSKeyItem typedef struct tagSKeyItem {
{
bool bKeyValid; bool bKeyValid;
unsigned long uKeyLength; unsigned long uKeyLength;
unsigned char abyKey[MAX_KEY_LEN]; unsigned char abyKey[MAX_KEY_LEN];
@ -67,8 +66,7 @@ typedef struct tagSKeyItem
void *pvKeyTable; void *pvKeyTable;
} SKeyItem, *PSKeyItem; //64 } SKeyItem, *PSKeyItem; //64
typedef struct tagSKeyTable typedef struct tagSKeyTable {
{
unsigned char abyBSSID[ETH_ALEN]; //6 unsigned char abyBSSID[ETH_ALEN]; //6
unsigned char byReserved0[2]; //8 unsigned char byReserved0[2]; //8
SKeyItem PairwiseKey; SKeyItem PairwiseKey;
@ -82,8 +80,7 @@ typedef struct tagSKeyTable
unsigned char byReserved1[6]; unsigned char byReserved1[6];
} SKeyTable, *PSKeyTable; //348 } SKeyTable, *PSKeyTable; //348
typedef struct tagSKeyManagement typedef struct tagSKeyManagement {
{
SKeyTable KeyTable[MAX_KEY_TABLE]; SKeyTable KeyTable[MAX_KEY_TABLE];
} SKeyManagement, *PSKeyManagement; } SKeyManagement, *PSKeyManagement;

12
drivers/staging/vt6655/wmgr.h
View File

@ -83,22 +83,19 @@ typedef void (*TimerFunction)(unsigned long);
//+++ NDIS related //+++ NDIS related
typedef unsigned char NDIS_802_11_MAC_ADDRESS[6]; typedef unsigned char NDIS_802_11_MAC_ADDRESS[6];
typedef struct _NDIS_802_11_AI_REQFI typedef struct _NDIS_802_11_AI_REQFI {
{
unsigned short Capabilities; unsigned short Capabilities;
unsigned short ListenInterval; unsigned short ListenInterval;
NDIS_802_11_MAC_ADDRESS CurrentAPAddress; NDIS_802_11_MAC_ADDRESS CurrentAPAddress;
} NDIS_802_11_AI_REQFI, *PNDIS_802_11_AI_REQFI; } NDIS_802_11_AI_REQFI, *PNDIS_802_11_AI_REQFI;
typedef struct _NDIS_802_11_AI_RESFI typedef struct _NDIS_802_11_AI_RESFI {
{
unsigned short Capabilities; unsigned short Capabilities;
unsigned short StatusCode; unsigned short StatusCode;
unsigned short AssociationId; unsigned short AssociationId;
} NDIS_802_11_AI_RESFI, *PNDIS_802_11_AI_RESFI; } NDIS_802_11_AI_RESFI, *PNDIS_802_11_AI_RESFI;
typedef struct _NDIS_802_11_ASSOCIATION_INFORMATION typedef struct _NDIS_802_11_ASSOCIATION_INFORMATION {
{
unsigned long Length; unsigned long Length;
unsigned short AvailableRequestFixedIEs; unsigned short AvailableRequestFixedIEs;
NDIS_802_11_AI_REQFI RequestFixedIEs; NDIS_802_11_AI_REQFI RequestFixedIEs;
@ -187,8 +184,7 @@ typedef struct tagSRxMgmtPacket {
unsigned char byRxChannel; unsigned char byRxChannel;
} SRxMgmtPacket, *PSRxMgmtPacket; } SRxMgmtPacket, *PSRxMgmtPacket;
typedef struct tagSMgmtObject typedef struct tagSMgmtObject {
{
void *pAdapter; void *pAdapter;
// MAC address // MAC address
unsigned char abyMACAddr[WLAN_ADDR_LEN]; unsigned char abyMACAddr[WLAN_ADDR_LEN];