staging:vt6655:bssdb: Whitespace cleanups

Neatening only.
git diff -w shows no differences.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Joe Perches 2013-03-18 10:44:39 -07:00 committed by Greg Kroah-Hartman
parent 375293671a
commit e1c7757938
2 changed files with 1408 additions and 1408 deletions

File diff suppressed because it is too large Load Diff

View File

@ -39,7 +39,7 @@
#define MAX_NODE_NUM 64 #define MAX_NODE_NUM 64
#define MAX_BSS_NUM 42 #define MAX_BSS_NUM 42
#define LOST_BEACON_COUNT 10 // 10 sec, XP defined #define LOST_BEACON_COUNT 10 // 10 sec, XP defined
#define MAX_PS_TX_BUF 32 // sta max power saving tx buf #define MAX_PS_TX_BUF 32 // sta max power saving tx buf
#define ADHOC_LOST_BEACON_COUNT 30 // 30 sec, beacon lost for adhoc only #define ADHOC_LOST_BEACON_COUNT 30 // 30 sec, beacon lost for adhoc only
#define MAX_INACTIVE_COUNT 300 // 300 sec, inactive STA node refresh #define MAX_INACTIVE_COUNT 300 // 300 sec, inactive STA node refresh
@ -81,159 +81,159 @@
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,
Ndis802_11OFDM24, Ndis802_11OFDM24,
Ndis802_11NetworkTypeMax // not a real type, defined as an upper bound Ndis802_11NetworkTypeMax // not a real type, defined as an upper bound
} NDIS_802_11_NETWORK_TYPE, *PNDIS_802_11_NETWORK_TYPE; } NDIS_802_11_NETWORK_TYPE, *PNDIS_802_11_NETWORK_TYPE;
typedef struct tagSERPObject { typedef struct tagSERPObject {
bool bERPExist; bool bERPExist;
unsigned char byERP; unsigned char byERP;
}ERPObject, *PERPObject; } ERPObject, *PERPObject;
typedef struct tagSRSNCapObject { typedef struct tagSRSNCapObject {
bool bRSNCapExist; bool bRSNCapExist;
unsigned short wRSNCap; unsigned short wRSNCap;
}SRSNCapObject, *PSRSNCapObject; } SRSNCapObject, *PSRSNCapObject;
// BSS info(AP) // BSS info(AP)
#pragma pack(1) #pragma pack(1)
typedef struct tagKnownBSS { typedef struct tagKnownBSS {
// BSS info // BSS info
bool bActive; bool bActive;
unsigned char abyBSSID[WLAN_BSSID_LEN]; unsigned char abyBSSID[WLAN_BSSID_LEN];
unsigned int uChannel; unsigned int uChannel;
unsigned char abySuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN + 1]; unsigned char abySuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN + 1];
unsigned char abyExtSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN + 1]; unsigned char abyExtSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN + 1];
unsigned int uRSSI; unsigned int uRSSI;
unsigned char bySQ; unsigned char bySQ;
unsigned short wBeaconInterval; unsigned short wBeaconInterval;
unsigned short wCapInfo; unsigned short wCapInfo;
unsigned char abySSID[WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1]; unsigned char abySSID[WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1];
unsigned char byRxRate; unsigned char byRxRate;
// unsigned short wATIMWindow; // unsigned short wATIMWindow;
unsigned char byRSSIStatCnt; unsigned char byRSSIStatCnt;
long ldBmMAX; long ldBmMAX;
long ldBmAverage[RSSI_STAT_COUNT]; long ldBmAverage[RSSI_STAT_COUNT];
long ldBmAverRange; long ldBmAverRange;
//For any BSSID selection improvment //For any BSSID selection improvment
bool bSelected; bool bSelected;
//++ WPA informations //++ WPA informations
bool bWPAValid; bool bWPAValid;
unsigned char byGKType; unsigned char byGKType;
unsigned char abyPKType[4]; unsigned char abyPKType[4];
unsigned short wPKCount; unsigned short wPKCount;
unsigned char abyAuthType[4]; unsigned char abyAuthType[4];
unsigned short wAuthCount; unsigned short wAuthCount;
unsigned char byDefaultK_as_PK; unsigned char byDefaultK_as_PK;
unsigned char byReplayIdx; unsigned char byReplayIdx;
//-- //--
//++ WPA2 informations //++ WPA2 informations
bool bWPA2Valid; bool bWPA2Valid;
unsigned char byCSSGK; unsigned char byCSSGK;
unsigned short wCSSPKCount; unsigned short wCSSPKCount;
unsigned char abyCSSPK[4]; unsigned char abyCSSPK[4];
unsigned short wAKMSSAuthCount; unsigned short wAKMSSAuthCount;
unsigned char abyAKMSSAuthType[4]; unsigned char abyAKMSSAuthType[4];
//++ wpactl //++ wpactl
unsigned char byWPAIE[MAX_WPA_IE_LEN]; unsigned char byWPAIE[MAX_WPA_IE_LEN];
unsigned char byRSNIE[MAX_WPA_IE_LEN]; unsigned char byRSNIE[MAX_WPA_IE_LEN];
unsigned short wWPALen; unsigned short wWPALen;
unsigned short wRSNLen; unsigned short wRSNLen;
// Clear count // Clear count
unsigned int uClearCount; unsigned int uClearCount;
// unsigned char abyIEs[WLAN_BEACON_FR_MAXLEN]; // unsigned char abyIEs[WLAN_BEACON_FR_MAXLEN];
unsigned int uIELength; unsigned int uIELength;
QWORD qwBSSTimestamp; QWORD qwBSSTimestamp;
QWORD qwLocalTSF; // local TSF timer QWORD qwLocalTSF; // local TSF timer
// NDIS_802_11_NETWORK_TYPE NetworkTypeInUse; // NDIS_802_11_NETWORK_TYPE NetworkTypeInUse;
CARD_PHY_TYPE eNetworkTypeInUse; CARD_PHY_TYPE eNetworkTypeInUse;
ERPObject sERP; ERPObject sERP;
SRSNCapObject sRSNCapObj; SRSNCapObject sRSNCapObj;
unsigned char abyIEs[1024]; // don't move this field !! unsigned char abyIEs[1024]; // don't move this field !!
}__attribute__ ((__packed__)) } __attribute__ ((__packed__))
KnownBSS , *PKnownBSS; KnownBSS , *PKnownBSS;
//2006-1116-01,<Add> by NomadZhao //2006-1116-01,<Add> by NomadZhao
#pragma pack() #pragma pack()
typedef enum tagNODE_STATE { typedef enum tagNODE_STATE {
NODE_FREE, NODE_FREE,
NODE_AGED, NODE_AGED,
NODE_KNOWN, NODE_KNOWN,
NODE_AUTH, NODE_AUTH,
NODE_ASSOC NODE_ASSOC
} NODE_STATE, *PNODE_STATE; } NODE_STATE, *PNODE_STATE;
// STA node info // STA node info
typedef struct tagKnownNodeDB { typedef struct tagKnownNodeDB {
// STA info // STA info
bool bActive; bool bActive;
unsigned char abyMACAddr[WLAN_ADDR_LEN]; unsigned char abyMACAddr[WLAN_ADDR_LEN];
unsigned char abyCurrSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN]; unsigned char abyCurrSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN];
unsigned char abyCurrExtSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN]; unsigned char abyCurrExtSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN];
unsigned short wTxDataRate; unsigned short wTxDataRate;
bool bShortPreamble; bool bShortPreamble;
bool bERPExist; bool bERPExist;
bool bShortSlotTime; bool bShortSlotTime;
unsigned int uInActiveCount; unsigned int uInActiveCount;
unsigned short wMaxBasicRate; //Get from byTopOFDMBasicRate or byTopCCKBasicRate which depends on packetTyp. unsigned short wMaxBasicRate; //Get from byTopOFDMBasicRate or byTopCCKBasicRate which depends on packetTyp.
unsigned short wMaxSuppRate; //Records the highest supported rate getting from SuppRates IE and ExtSuppRates IE in Beacon. unsigned short wMaxSuppRate; //Records the highest supported rate getting from SuppRates IE and ExtSuppRates IE in Beacon.
unsigned short wSuppRate; unsigned short wSuppRate;
unsigned char byTopOFDMBasicRate;//Records the highest basic rate in OFDM mode unsigned char byTopOFDMBasicRate;//Records the highest basic rate in OFDM mode
unsigned char byTopCCKBasicRate; //Records the highest basic rate in CCK mode unsigned char byTopCCKBasicRate; //Records the highest basic rate in CCK mode
// For AP mode // For AP mode
struct sk_buff_head sTxPSQueue; struct sk_buff_head sTxPSQueue;
unsigned short wCapInfo; unsigned short wCapInfo;
unsigned short wListenInterval; unsigned short wListenInterval;
unsigned short wAID; unsigned short wAID;
NODE_STATE eNodeState; NODE_STATE eNodeState;
bool bPSEnable; bool bPSEnable;
bool bRxPSPoll; bool bRxPSPoll;
unsigned char byAuthSequence; unsigned char byAuthSequence;
unsigned long ulLastRxJiffer; unsigned long ulLastRxJiffer;
unsigned char bySuppRate; unsigned char bySuppRate;
unsigned long dwFlags; unsigned long dwFlags;
unsigned short wEnQueueCnt; unsigned short wEnQueueCnt;
bool bOnFly; bool bOnFly;
unsigned long long KeyRSC; unsigned long long KeyRSC;
unsigned char byKeyIndex; unsigned char byKeyIndex;
unsigned long dwKeyIndex; unsigned long dwKeyIndex;
unsigned char byCipherSuite; unsigned char byCipherSuite;
unsigned long dwTSC47_16; unsigned long dwTSC47_16;
unsigned short wTSC15_0; unsigned short wTSC15_0;
unsigned int uWepKeyLength; unsigned int uWepKeyLength;
unsigned char abyWepKey[WLAN_WEPMAX_KEYLEN]; unsigned char abyWepKey[WLAN_WEPMAX_KEYLEN];
// //
// Auto rate fallback vars // Auto rate fallback vars
bool bIsInFallback; bool bIsInFallback;
unsigned int uAverageRSSI; unsigned int uAverageRSSI;
unsigned int uRateRecoveryTimeout; unsigned int uRateRecoveryTimeout;
unsigned int uRatePollTimeout; unsigned int uRatePollTimeout;
unsigned int uTxFailures; unsigned int uTxFailures;
unsigned int uTxAttempts; unsigned int uTxAttempts;
unsigned int uTxRetry; unsigned int uTxRetry;
unsigned int uFailureRatio; unsigned int uFailureRatio;
unsigned int uRetryRatio; unsigned int uRetryRatio;
unsigned int uTxOk[MAX_RATE+1]; unsigned int uTxOk[MAX_RATE+1];
unsigned int uTxFail[MAX_RATE+1]; unsigned int uTxFail[MAX_RATE+1];
unsigned int uTimeCount; unsigned int uTimeCount;
} KnownNodeDB, *PKnownNodeDB; } KnownNodeDB, *PKnownNodeDB;
@ -244,122 +244,122 @@ typedef struct tagKnownNodeDB {
PKnownBSS PKnownBSS
BSSpSearchBSSList( BSSpSearchBSSList(
void *hDeviceContext, void *hDeviceContext,
unsigned char *pbyDesireBSSID, unsigned char *pbyDesireBSSID,
unsigned char *pbyDesireSSID, unsigned char *pbyDesireSSID,
CARD_PHY_TYPE ePhyType CARD_PHY_TYPE ePhyType
); );
PKnownBSS PKnownBSS
BSSpAddrIsInBSSList( BSSpAddrIsInBSSList(
void *hDeviceContext, void *hDeviceContext,
unsigned char *abyBSSID, unsigned char *abyBSSID,
PWLAN_IE_SSID pSSID PWLAN_IE_SSID pSSID
); );
void void
BSSvClearBSSList( BSSvClearBSSList(
void *hDeviceContext, void *hDeviceContext,
bool bKeepCurrBSSID bool bKeepCurrBSSID
); );
bool bool
BSSbInsertToBSSList( BSSbInsertToBSSList(
void *hDeviceContext, void *hDeviceContext,
unsigned char *abyBSSIDAddr, unsigned char *abyBSSIDAddr,
QWORD qwTimestamp, QWORD qwTimestamp,
unsigned short wBeaconInterval, unsigned short wBeaconInterval,
unsigned short wCapInfo, unsigned short wCapInfo,
unsigned char byCurrChannel, unsigned char byCurrChannel,
PWLAN_IE_SSID pSSID, PWLAN_IE_SSID pSSID,
PWLAN_IE_SUPP_RATES pSuppRates, PWLAN_IE_SUPP_RATES pSuppRates,
PWLAN_IE_SUPP_RATES pExtSuppRates, PWLAN_IE_SUPP_RATES pExtSuppRates,
PERPObject psERP, PERPObject psERP,
PWLAN_IE_RSN pRSN, PWLAN_IE_RSN pRSN,
PWLAN_IE_RSN_EXT pRSNWPA, PWLAN_IE_RSN_EXT pRSNWPA,
PWLAN_IE_COUNTRY pIE_Country, PWLAN_IE_COUNTRY pIE_Country,
PWLAN_IE_QUIET pIE_Quiet, PWLAN_IE_QUIET pIE_Quiet,
unsigned int uIELength, unsigned int uIELength,
unsigned char *pbyIEs, unsigned char *pbyIEs,
void *pRxPacketContext void *pRxPacketContext
); );
bool bool
BSSbUpdateToBSSList( BSSbUpdateToBSSList(
void *hDeviceContext, void *hDeviceContext,
QWORD qwTimestamp, QWORD qwTimestamp,
unsigned short wBeaconInterval, unsigned short wBeaconInterval,
unsigned short wCapInfo, unsigned short wCapInfo,
unsigned char byCurrChannel, unsigned char byCurrChannel,
bool bChannelHit, bool bChannelHit,
PWLAN_IE_SSID pSSID, PWLAN_IE_SSID pSSID,
PWLAN_IE_SUPP_RATES pSuppRates, PWLAN_IE_SUPP_RATES pSuppRates,
PWLAN_IE_SUPP_RATES pExtSuppRates, PWLAN_IE_SUPP_RATES pExtSuppRates,
PERPObject psERP, PERPObject psERP,
PWLAN_IE_RSN pRSN, PWLAN_IE_RSN pRSN,
PWLAN_IE_RSN_EXT pRSNWPA, PWLAN_IE_RSN_EXT pRSNWPA,
PWLAN_IE_COUNTRY pIE_Country, PWLAN_IE_COUNTRY pIE_Country,
PWLAN_IE_QUIET pIE_Quiet, PWLAN_IE_QUIET pIE_Quiet,
PKnownBSS pBSSList, PKnownBSS pBSSList,
unsigned int uIELength, unsigned int uIELength,
unsigned char *pbyIEs, unsigned char *pbyIEs,
void *pRxPacketContext void *pRxPacketContext
); );
bool bool
BSSDBbIsSTAInNodeDB(void *hDeviceContext, unsigned char *abyDstAddr, BSSDBbIsSTAInNodeDB(void *hDeviceContext, unsigned char *abyDstAddr,
unsigned int *puNodeIndex); unsigned int *puNodeIndex);
void void
BSSvCreateOneNode(void *hDeviceContext, unsigned int *puNodeIndex); BSSvCreateOneNode(void *hDeviceContext, unsigned int *puNodeIndex);
void void
BSSvUpdateAPNode( BSSvUpdateAPNode(
void *hDeviceContext, void *hDeviceContext,
unsigned short *pwCapInfo, unsigned short *pwCapInfo,
PWLAN_IE_SUPP_RATES pItemRates, PWLAN_IE_SUPP_RATES pItemRates,
PWLAN_IE_SUPP_RATES pExtSuppRates PWLAN_IE_SUPP_RATES pExtSuppRates
); );
void void
BSSvSecondCallBack( BSSvSecondCallBack(
void *hDeviceContext void *hDeviceContext
); );
void void
BSSvUpdateNodeTxCounter( BSSvUpdateNodeTxCounter(
void *hDeviceContext, void *hDeviceContext,
unsigned char byTsr0, unsigned char byTsr0,
unsigned char byTsr1, unsigned char byTsr1,
unsigned char *pbyBuffer, unsigned char *pbyBuffer,
unsigned int uFIFOHeaderSize unsigned int uFIFOHeaderSize
); );
void void
BSSvRemoveOneNode( BSSvRemoveOneNode(
void *hDeviceContext, void *hDeviceContext,
unsigned int uNodeIndex unsigned int uNodeIndex
); );
void void
BSSvAddMulticastNode( BSSvAddMulticastNode(
void *hDeviceContext void *hDeviceContext
); );
void void
BSSvClearNodeDBTable( BSSvClearNodeDBTable(
void *hDeviceContext, void *hDeviceContext,
unsigned int uStartIndex unsigned int uStartIndex
); );
void void
BSSvClearAnyBSSJoinRecord( BSSvClearAnyBSSJoinRecord(
void *hDeviceContext void *hDeviceContext
); );
#endif //__BSSDB_H__ #endif //__BSSDB_H__