staging:vt6655:wmgr: 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:45:11 -07:00 committed by Greg Kroah-Hartman
parent e2b8c6d3a5
commit cb850a64d1
2 changed files with 3892 additions and 3892 deletions

File diff suppressed because it is too large Load Diff

View File

@ -82,7 +82,7 @@
/*--------------------- Export Variables --------------------------*/
/*--------------------- Export Types ------------------------------*/
#define timer_expire(timer,next_tick) mod_timer(&timer, RUN_AT(next_tick))
#define timer_expire(timer, next_tick) mod_timer(&timer, RUN_AT(next_tick))
typedef void (*TimerFunction)(unsigned long);
@ -91,87 +91,87 @@ typedef void (*TimerFunction)(unsigned long);
typedef unsigned char NDIS_802_11_MAC_ADDRESS[6];
typedef struct _NDIS_802_11_AI_REQFI
{
unsigned short Capabilities;
unsigned short ListenInterval;
NDIS_802_11_MAC_ADDRESS CurrentAPAddress;
unsigned short Capabilities;
unsigned short ListenInterval;
NDIS_802_11_MAC_ADDRESS CurrentAPAddress;
} NDIS_802_11_AI_REQFI, *PNDIS_802_11_AI_REQFI;
typedef struct _NDIS_802_11_AI_RESFI
{
unsigned short Capabilities;
unsigned short StatusCode;
unsigned short AssociationId;
unsigned short Capabilities;
unsigned short StatusCode;
unsigned short AssociationId;
} NDIS_802_11_AI_RESFI, *PNDIS_802_11_AI_RESFI;
typedef struct _NDIS_802_11_ASSOCIATION_INFORMATION
{
unsigned long Length;
unsigned short AvailableRequestFixedIEs;
NDIS_802_11_AI_REQFI RequestFixedIEs;
unsigned long RequestIELength;
unsigned long OffsetRequestIEs;
unsigned short AvailableResponseFixedIEs;
NDIS_802_11_AI_RESFI ResponseFixedIEs;
unsigned long ResponseIELength;
unsigned long OffsetResponseIEs;
unsigned long Length;
unsigned short AvailableRequestFixedIEs;
NDIS_802_11_AI_REQFI RequestFixedIEs;
unsigned long RequestIELength;
unsigned long OffsetRequestIEs;
unsigned short AvailableResponseFixedIEs;
NDIS_802_11_AI_RESFI ResponseFixedIEs;
unsigned long ResponseIELength;
unsigned long OffsetResponseIEs;
} NDIS_802_11_ASSOCIATION_INFORMATION, *PNDIS_802_11_ASSOCIATION_INFORMATION;
typedef struct tagSAssocInfo {
NDIS_802_11_ASSOCIATION_INFORMATION AssocInfo;
unsigned char abyIEs[WLAN_BEACON_FR_MAXLEN+WLAN_BEACON_FR_MAXLEN];
// store ReqIEs set by OID_802_11_ASSOCIATION_INFORMATION
unsigned long RequestIELength;
unsigned char abyReqIEs[WLAN_BEACON_FR_MAXLEN];
NDIS_802_11_ASSOCIATION_INFORMATION AssocInfo;
unsigned char abyIEs[WLAN_BEACON_FR_MAXLEN+WLAN_BEACON_FR_MAXLEN];
// store ReqIEs set by OID_802_11_ASSOCIATION_INFORMATION
unsigned long RequestIELength;
unsigned char abyReqIEs[WLAN_BEACON_FR_MAXLEN];
} SAssocInfo, *PSAssocInfo;
//---
/*
typedef enum tagWMAC_AUTHENTICATION_MODE {
typedef enum tagWMAC_AUTHENTICATION_MODE {
WMAC_AUTH_OPEN,
WMAC_AUTH_SHAREKEY,
WMAC_AUTH_AUTO,
WMAC_AUTH_WPA,
WMAC_AUTH_WPAPSK,
WMAC_AUTH_WPANONE,
WMAC_AUTH_WPA2,
WMAC_AUTH_WPA2PSK,
WMAC_AUTH_MAX // Not a real mode, defined as upper bound
WMAC_AUTH_OPEN,
WMAC_AUTH_SHAREKEY,
WMAC_AUTH_AUTO,
WMAC_AUTH_WPA,
WMAC_AUTH_WPAPSK,
WMAC_AUTH_WPANONE,
WMAC_AUTH_WPA2,
WMAC_AUTH_WPA2PSK,
WMAC_AUTH_MAX // Not a real mode, defined as upper bound
} WMAC_AUTHENTICATION_MODE, *PWMAC_AUTHENTICATION_MODE;
} WMAC_AUTHENTICATION_MODE, *PWMAC_AUTHENTICATION_MODE;
*/
// Pre-configured Mode (from XP)
/*
typedef enum tagWMAC_CONFIG_MODE {
WMAC_CONFIG_ESS_STA,
WMAC_CONFIG_IBSS_STA,
WMAC_CONFIG_AUTO,
WMAC_CONFIG_AP
typedef enum tagWMAC_CONFIG_MODE {
WMAC_CONFIG_ESS_STA,
WMAC_CONFIG_IBSS_STA,
WMAC_CONFIG_AUTO,
WMAC_CONFIG_AP
} WMAC_CONFIG_MODE, *PWMAC_CONFIG_MODE;
} WMAC_CONFIG_MODE, *PWMAC_CONFIG_MODE;
*/
typedef enum tagWMAC_SCAN_TYPE {
WMAC_SCAN_ACTIVE,
WMAC_SCAN_PASSIVE,
WMAC_SCAN_HYBRID
WMAC_SCAN_ACTIVE,
WMAC_SCAN_PASSIVE,
WMAC_SCAN_HYBRID
} WMAC_SCAN_TYPE, *PWMAC_SCAN_TYPE;
typedef enum tagWMAC_SCAN_STATE {
WMAC_NO_SCANNING,
WMAC_IS_SCANNING,
WMAC_IS_PROBEPENDING
WMAC_NO_SCANNING,
WMAC_IS_SCANNING,
WMAC_IS_PROBEPENDING
} WMAC_SCAN_STATE, *PWMAC_SCAN_STATE;
@ -189,43 +189,43 @@ typedef enum tagWMAC_SCAN_STATE {
typedef enum tagWMAC_BSS_STATE {
WMAC_STATE_IDLE,
WMAC_STATE_STARTED,
WMAC_STATE_JOINTED,
WMAC_STATE_AUTHPENDING,
WMAC_STATE_AUTH,
WMAC_STATE_ASSOCPENDING,
WMAC_STATE_ASSOC
WMAC_STATE_IDLE,
WMAC_STATE_STARTED,
WMAC_STATE_JOINTED,
WMAC_STATE_AUTHPENDING,
WMAC_STATE_AUTH,
WMAC_STATE_ASSOCPENDING,
WMAC_STATE_ASSOC
} WMAC_BSS_STATE, *PWMAC_BSS_STATE;
// WMAC selected running mode
typedef enum tagWMAC_CURRENT_MODE {
WMAC_MODE_STANDBY,
WMAC_MODE_ESS_STA,
WMAC_MODE_IBSS_STA,
WMAC_MODE_ESS_AP
WMAC_MODE_STANDBY,
WMAC_MODE_ESS_STA,
WMAC_MODE_IBSS_STA,
WMAC_MODE_ESS_AP
} WMAC_CURRENT_MODE, *PWMAC_CURRENT_MODE;
/*
typedef enum tagWMAC_POWER_MODE {
typedef enum tagWMAC_POWER_MODE {
WMAC_POWER_CAM,
WMAC_POWER_FAST,
WMAC_POWER_MAX
WMAC_POWER_CAM,
WMAC_POWER_FAST,
WMAC_POWER_MAX
} WMAC_POWER_MODE, *PWMAC_POWER_MODE;
} WMAC_POWER_MODE, *PWMAC_POWER_MODE;
*/
// Tx Management Packet descriptor
typedef struct tagSTxMgmtPacket {
PUWLAN_80211HDR p80211Header;
unsigned int cbMPDULen;
unsigned int cbPayloadLen;
PUWLAN_80211HDR p80211Header;
unsigned int cbMPDULen;
unsigned int cbPayloadLen;
} STxMgmtPacket, *PSTxMgmtPacket;
@ -233,14 +233,14 @@ typedef struct tagSTxMgmtPacket {
// Rx Management Packet descriptor
typedef struct tagSRxMgmtPacket {
PUWLAN_80211HDR p80211Header;
QWORD qwLocalTSF;
unsigned int cbMPDULen;
unsigned int cbPayloadLen;
unsigned int uRSSI;
unsigned char bySQ;
unsigned char byRxRate;
unsigned char byRxChannel;
PUWLAN_80211HDR p80211Header;
QWORD qwLocalTSF;
unsigned int cbMPDULen;
unsigned int cbPayloadLen;
unsigned int uRSSI;
unsigned char bySQ;
unsigned char byRxRate;
unsigned char byRxChannel;
} SRxMgmtPacket, *PSRxMgmtPacket;
@ -249,146 +249,146 @@ typedef struct tagSRxMgmtPacket {
typedef struct tagSMgmtObject
{
void * pAdapter;
// MAC address
unsigned char abyMACAddr[WLAN_ADDR_LEN];
void *pAdapter;
// MAC address
unsigned char abyMACAddr[WLAN_ADDR_LEN];
// Configuration Mode
WMAC_CONFIG_MODE eConfigMode; // MAC pre-configed mode
CARD_PHY_TYPE eCurrentPHYMode;
CARD_PHY_TYPE eConfigPHYMode;
// Configuration Mode
WMAC_CONFIG_MODE eConfigMode; // MAC pre-configed mode
CARD_PHY_TYPE eCurrentPHYMode;
CARD_PHY_TYPE eConfigPHYMode;
// Operation state variables
WMAC_CURRENT_MODE eCurrMode; // MAC current connection mode
WMAC_BSS_STATE eCurrState; // MAC current BSS state
// Operation state variables
WMAC_CURRENT_MODE eCurrMode; // MAC current connection mode
WMAC_BSS_STATE eCurrState; // MAC current BSS state
PKnownBSS pCurrBSS;
unsigned char byCSSGK;
unsigned char byCSSPK;
PKnownBSS pCurrBSS;
unsigned char byCSSGK;
unsigned char byCSSPK;
// unsigned char abyNewSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN];
// unsigned char abyNewExtSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN];
// Current state vars
unsigned int uCurrChannel;
unsigned char abyCurrSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN + 1];
unsigned char abyCurrExtSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN + 1];
unsigned char abyCurrSSID[WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1];
unsigned char abyCurrBSSID[WLAN_BSSID_LEN];
unsigned short wCurrCapInfo;
unsigned short wCurrAID;
unsigned short wCurrATIMWindow;
unsigned short wCurrBeaconPeriod;
bool bIsDS;
unsigned char byERPContext;
// Current state vars
unsigned int uCurrChannel;
unsigned char abyCurrSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN + 1];
unsigned char abyCurrExtSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN + 1];
unsigned char abyCurrSSID[WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1];
unsigned char abyCurrBSSID[WLAN_BSSID_LEN];
unsigned short wCurrCapInfo;
unsigned short wCurrAID;
unsigned short wCurrATIMWindow;
unsigned short wCurrBeaconPeriod;
bool bIsDS;
unsigned char byERPContext;
CMD_STATE eCommandState;
unsigned int uScanChannel;
CMD_STATE eCommandState;
unsigned int uScanChannel;
// Desire joining BSS vars
unsigned char abyDesireSSID[WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1];
unsigned char abyDesireBSSID[WLAN_BSSID_LEN];
// Desire joining BSS vars
unsigned char abyDesireSSID[WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1];
unsigned char abyDesireBSSID[WLAN_BSSID_LEN];
// Adhoc or AP configuration vars
//unsigned char abyAdHocSSID[WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1];
unsigned short wIBSSBeaconPeriod;
unsigned short wIBSSATIMWindow;
unsigned int uIBSSChannel;
unsigned char abyIBSSSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN + 1];
unsigned char byAPBBType;
unsigned char abyWPAIE[MAX_WPA_IE_LEN];
unsigned short wWPAIELen;
// Adhoc or AP configuration vars
//unsigned char abyAdHocSSID[WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1];
unsigned short wIBSSBeaconPeriod;
unsigned short wIBSSATIMWindow;
unsigned int uIBSSChannel;
unsigned char abyIBSSSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN + 1];
unsigned char byAPBBType;
unsigned char abyWPAIE[MAX_WPA_IE_LEN];
unsigned short wWPAIELen;
unsigned int uAssocCount;
bool bMoreData;
unsigned int uAssocCount;
bool bMoreData;
// Scan state vars
WMAC_SCAN_STATE eScanState;
WMAC_SCAN_TYPE eScanType;
unsigned int uScanStartCh;
unsigned int uScanEndCh;
unsigned short wScanSteps;
unsigned int uScanBSSType;
// Desire scanning vars
unsigned char abyScanSSID[WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1];
unsigned char abyScanBSSID[WLAN_BSSID_LEN];
// Scan state vars
WMAC_SCAN_STATE eScanState;
WMAC_SCAN_TYPE eScanType;
unsigned int uScanStartCh;
unsigned int uScanEndCh;
unsigned short wScanSteps;
unsigned int uScanBSSType;
// Desire scanning vars
unsigned char abyScanSSID[WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1];
unsigned char abyScanBSSID[WLAN_BSSID_LEN];
// Privacy
WMAC_AUTHENTICATION_MODE eAuthenMode;
WMAC_ENCRYPTION_MODE eEncryptionMode;
bool bShareKeyAlgorithm;
unsigned char abyChallenge[WLAN_CHALLENGE_LEN];
bool bPrivacyInvoked;
// Privacy
WMAC_AUTHENTICATION_MODE eAuthenMode;
WMAC_ENCRYPTION_MODE eEncryptionMode;
bool bShareKeyAlgorithm;
unsigned char abyChallenge[WLAN_CHALLENGE_LEN];
bool bPrivacyInvoked;
// Received beacon state vars
bool bInTIM;
bool bMulticastTIM;
unsigned char byDTIMCount;
unsigned char byDTIMPeriod;
// Received beacon state vars
bool bInTIM;
bool bMulticastTIM;
unsigned char byDTIMCount;
unsigned char byDTIMPeriod;
// Power saving state vars
WMAC_POWER_MODE ePSMode;
unsigned short wListenInterval;
unsigned short wCountToWakeUp;
bool bInTIMWake;
unsigned char *pbyPSPacketPool;
unsigned char byPSPacketPool[sizeof(STxMgmtPacket) + WLAN_NULLDATA_FR_MAXLEN];
bool bRxBeaconInTBTTWake;
unsigned char abyPSTxMap[MAX_NODE_NUM + 1];
// Power saving state vars
WMAC_POWER_MODE ePSMode;
unsigned short wListenInterval;
unsigned short wCountToWakeUp;
bool bInTIMWake;
unsigned char *pbyPSPacketPool;
unsigned char byPSPacketPool[sizeof(STxMgmtPacket) + WLAN_NULLDATA_FR_MAXLEN];
bool bRxBeaconInTBTTWake;
unsigned char abyPSTxMap[MAX_NODE_NUM + 1];
// management command related
unsigned int uCmdBusy;
unsigned int uCmdHostAPBusy;
// management command related
unsigned int uCmdBusy;
unsigned int uCmdHostAPBusy;
// management packet pool
unsigned char *pbyMgmtPacketPool;
unsigned char byMgmtPacketPool[sizeof(STxMgmtPacket) + WLAN_A3FR_MAXLEN];
// management packet pool
unsigned char *pbyMgmtPacketPool;
unsigned char byMgmtPacketPool[sizeof(STxMgmtPacket) + WLAN_A3FR_MAXLEN];
// One second callback timer
struct timer_list sTimerSecondCallback;
// One second callback timer
struct timer_list sTimerSecondCallback;
// Temporarily Rx Mgmt Packet Descriptor
SRxMgmtPacket sRxPacket;
// Temporarily Rx Mgmt Packet Descriptor
SRxMgmtPacket sRxPacket;
// link list of known bss's (scan results)
KnownBSS sBSSList[MAX_BSS_NUM];
// link list of known bss's (scan results)
KnownBSS sBSSList[MAX_BSS_NUM];
// table list of known node
// sNodeDBList[0] is reserved for AP under Infra mode
// sNodeDBList[0] is reserved for Multicast under adhoc/AP mode
KnownNodeDB sNodeDBTable[MAX_NODE_NUM + 1];
// table list of known node
// sNodeDBList[0] is reserved for AP under Infra mode
// sNodeDBList[0] is reserved for Multicast under adhoc/AP mode
KnownNodeDB sNodeDBTable[MAX_NODE_NUM + 1];
// WPA2 PMKID Cache
SPMKIDCache gsPMKIDCache;
bool bRoaming;
// WPA2 PMKID Cache
SPMKIDCache gsPMKIDCache;
bool bRoaming;
// rate fall back vars
// rate fall back vars
// associate info
SAssocInfo sAssocInfo;
// associate info
SAssocInfo sAssocInfo;
// for 802.11h
bool b11hEnable;
bool bSwitchChannel;
unsigned char byNewChannel;
PWLAN_IE_MEASURE_REP pCurrMeasureEIDRep;
unsigned int uLengthOfRepEIDs;
unsigned char abyCurrentMSRReq[sizeof(STxMgmtPacket) + WLAN_A3FR_MAXLEN];
unsigned char abyCurrentMSRRep[sizeof(STxMgmtPacket) + WLAN_A3FR_MAXLEN];
unsigned char abyIECountry[WLAN_A3FR_MAXLEN];
unsigned char abyIBSSDFSOwner[6];
unsigned char byIBSSDFSRecovery;
// for 802.11h
bool b11hEnable;
bool bSwitchChannel;
unsigned char byNewChannel;
PWLAN_IE_MEASURE_REP pCurrMeasureEIDRep;
unsigned int uLengthOfRepEIDs;
unsigned char abyCurrentMSRReq[sizeof(STxMgmtPacket) + WLAN_A3FR_MAXLEN];
unsigned char abyCurrentMSRRep[sizeof(STxMgmtPacket) + WLAN_A3FR_MAXLEN];
unsigned char abyIECountry[WLAN_A3FR_MAXLEN];
unsigned char abyIBSSDFSOwner[6];
unsigned char byIBSSDFSRecovery;
struct sk_buff skb;
struct sk_buff skb;
} SMgmtObject, *PSMgmtObject;
@ -401,102 +401,102 @@ typedef struct tagSMgmtObject
void
vMgrObjectInit(
void *hDeviceContext
);
void *hDeviceContext
);
void
vMgrTimerInit(
void *hDeviceContext
);
void *hDeviceContext
);
void
vMgrObjectReset(
void *hDeviceContext
);
void *hDeviceContext
);
void
vMgrAssocBeginSta(
void *hDeviceContext,
PSMgmtObject pMgmt,
PCMD_STATUS pStatus
);
void *hDeviceContext,
PSMgmtObject pMgmt,
PCMD_STATUS pStatus
);
void
vMgrReAssocBeginSta(
void *hDeviceContext,
PSMgmtObject pMgmt,
PCMD_STATUS pStatus
);
void *hDeviceContext,
PSMgmtObject pMgmt,
PCMD_STATUS pStatus
);
void
vMgrDisassocBeginSta(
void *hDeviceContext,
PSMgmtObject pMgmt,
unsigned char *abyDestAddress,
unsigned short wReason,
PCMD_STATUS pStatus
);
void *hDeviceContext,
PSMgmtObject pMgmt,
unsigned char *abyDestAddress,
unsigned short wReason,
PCMD_STATUS pStatus
);
void
vMgrAuthenBeginSta(
void *hDeviceContext,
PSMgmtObject pMgmt,
PCMD_STATUS pStatus
);
void *hDeviceContext,
PSMgmtObject pMgmt,
PCMD_STATUS pStatus
);
void
vMgrCreateOwnIBSS(
void *hDeviceContext,
PCMD_STATUS pStatus
);
void *hDeviceContext,
PCMD_STATUS pStatus
);
void
vMgrJoinBSSBegin(
void *hDeviceContext,
PCMD_STATUS pStatus
);
void *hDeviceContext,
PCMD_STATUS pStatus
);
void
vMgrRxManagePacket(
void *hDeviceContext,
PSMgmtObject pMgmt,
PSRxMgmtPacket pRxPacket
);
void *hDeviceContext,
PSMgmtObject pMgmt,
PSRxMgmtPacket pRxPacket
);
/*
void
vMgrScanBegin(
void *hDeviceContext,
PCMD_STATUS pStatus
);
void
vMgrScanBegin(
void *hDeviceContext,
PCMD_STATUS pStatus
);
*/
void
vMgrDeAuthenBeginSta(
void *hDeviceContext,
PSMgmtObject pMgmt,
unsigned char *abyDestAddress,
unsigned short wReason,
PCMD_STATUS pStatus
);
void *hDeviceContext,
PSMgmtObject pMgmt,
unsigned char *abyDestAddress,
unsigned short wReason,
PCMD_STATUS pStatus
);
bool
bMgrPrepareBeaconToSend(
void *hDeviceContext,
PSMgmtObject pMgmt
);
void *hDeviceContext,
PSMgmtObject pMgmt
);
bool
bAdd_PMKID_Candidate (
void *hDeviceContext,
unsigned char *pbyBSSID,
PSRSNCapObject psRSNCapObj
);
bAdd_PMKID_Candidate(
void *hDeviceContext,
unsigned char *pbyBSSID,
PSRSNCapObject psRSNCapObj
);
void
vFlush_PMKID_Candidate (
void *hDeviceContext
);
vFlush_PMKID_Candidate(
void *hDeviceContext
);
#endif // __WMGR_H__