Skip to content

L
linux
Commit 0e0a824e authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman
Browse files
Options

staging: vt6656: cleanup vnt_manger. 

Where appropriate replacing types defined in "type.h" with
linux/types.h.
Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 61462ab3
Show whitespace changes
Inline Side-by-side
Showing with 122 additions and 131 deletions
drivers/staging/vt6656/wmgr.h
View file @ 0e0a824e
...@@ -241,153 +241,144 @@ struct vnt_rx_mgmt { ...@@ -241,153 +241,144 @@ struct vnt_rx_mgmt {
struct vnt_manager { struct vnt_manager {
void *pAdapter; void *pAdapter;
// MAC address
BYTE abyMACAddr[WLAN_ADDR_LEN];
// Configuration Mode /* MAC address */
WMAC_CONFIG_MODE eConfigMode; // MAC pre-configed mode u8 abyMACAddr[WLAN_ADDR_LEN];
CARD_PHY_TYPE eCurrentPHYMode; /* Configuration Mode */
WMAC_CONFIG_MODE eConfigMode; /* MAC pre-configed mode */
CARD_PHY_TYPE eCurrentPHYMode;
// Operation state variables /* Operation state variables */
WMAC_CURRENT_MODE eCurrMode; // MAC current connection mode WMAC_CURRENT_MODE eCurrMode; /* MAC current connection mode */
WMAC_BSS_STATE eCurrState; // MAC current BSS state WMAC_BSS_STATE eCurrState; /* MAC current BSS state */
WMAC_BSS_STATE eLastState; // MAC last BSS state WMAC_BSS_STATE eLastState; /* MAC last BSS state */
PKnownBSS pCurrBSS; PKnownBSS pCurrBSS;
BYTE byCSSGK; u8 byCSSGK;
BYTE byCSSPK; u8 byCSSPK;
// BYTE abyNewSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN]; int bCurrBSSIDFilterOn;
// BYTE abyNewExtSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN];
BOOL bCurrBSSIDFilterOn; /* Current state vars */
u32 uCurrChannel;
// Current state vars u8 abyCurrSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN + 1];
unsigned int uCurrChannel; u8 abyCurrExtSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN + 1];
BYTE abyCurrSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN + 1]; u8 abyCurrSSID[WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1];
BYTE abyCurrExtSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN + 1]; u8 abyCurrBSSID[WLAN_BSSID_LEN];
BYTE abyCurrSSID[WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1]; u16 wCurrCapInfo;
BYTE abyCurrBSSID[WLAN_BSSID_LEN]; u16 wCurrAID;
WORD wCurrCapInfo; u32 uRSSITrigger;
WORD wCurrAID; u16 wCurrATIMWindow;
unsigned int uRSSITrigger; u16 wCurrBeaconPeriod;
WORD wCurrATIMWindow; int bIsDS;
WORD wCurrBeaconPeriod; u8 byERPContext;
BOOL bIsDS;
BYTE byERPContext;
CMD_STATE eCommandState; CMD_STATE eCommandState;
unsigned int uScanChannel; u32 uScanChannel;
// Desire joinning BSS vars /* Desire joinning BSS vars */
BYTE abyDesireSSID[WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1]; u8 abyDesireSSID[WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1];
BYTE abyDesireBSSID[WLAN_BSSID_LEN]; u8 abyDesireBSSID[WLAN_BSSID_LEN];
//restore BSS info for Ad-Hoc mode /*restore BSS info for Ad-Hoc mode */
BYTE abyAdHocSSID[WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1]; u8 abyAdHocSSID[WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1];
// Adhoc or AP configuration vars /* Adhoc or AP configuration vars */
WORD wIBSSBeaconPeriod; u16 wIBSSBeaconPeriod;
WORD wIBSSATIMWindow; u16 wIBSSATIMWindow;
unsigned int uIBSSChannel; u32 uIBSSChannel;
BYTE abyIBSSSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN + 1]; u8 abyIBSSSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN + 1];
BYTE byAPBBType; u8 byAPBBType;
BYTE abyWPAIE[MAX_WPA_IE_LEN]; u8 abyWPAIE[MAX_WPA_IE_LEN];
WORD wWPAIELen; u16 wWPAIELen;
unsigned int uAssocCount; u32 uAssocCount;
BOOL bMoreData; int bMoreData;
// Scan state vars /* Scan state vars */
WMAC_SCAN_STATE eScanState; WMAC_SCAN_STATE eScanState;
WMAC_SCAN_TYPE eScanType; WMAC_SCAN_TYPE eScanType;
unsigned int uScanStartCh; u32 uScanStartCh;
unsigned int uScanEndCh; u32 uScanEndCh;
WORD wScanSteps; u16 wScanSteps;
unsigned int uScanBSSType; u32 uScanBSSType;
// Desire scannig vars /* Desire scannig vars */
BYTE abyScanSSID[WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1]; u8 abyScanSSID[WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1];
BYTE abyScanBSSID[WLAN_BSSID_LEN]; u8 abyScanBSSID[WLAN_BSSID_LEN];
// Privacy /* Privacy */
WMAC_AUTHENTICATION_MODE eAuthenMode; WMAC_AUTHENTICATION_MODE eAuthenMode;
BOOL bShareKeyAlgorithm; int bShareKeyAlgorithm;
BYTE abyChallenge[WLAN_CHALLENGE_LEN]; u8 abyChallenge[WLAN_CHALLENGE_LEN];
BOOL bPrivacyInvoked; int bPrivacyInvoked;
// Received beacon state vars /* Received beacon state vars */
BOOL bInTIM; int bInTIM;
BOOL bMulticastTIM; int bMulticastTIM;
BYTE byDTIMCount; u8 byDTIMCount;
BYTE byDTIMPeriod; u8 byDTIMPeriod;
// Power saving state vars /* Power saving state vars */
WMAC_POWER_MODE ePSMode; WMAC_POWER_MODE ePSMode;
WORD wListenInterval; u16 wListenInterval;
WORD wCountToWakeUp; u16 wCountToWakeUp;
BOOL bInTIMWake; int bInTIMWake;
PBYTE pbyPSPacketPool; u8 *pbyPSPacketPool;
u8 byPSPacketPool[sizeof(struct vnt_tx_mgmt) u8 byPSPacketPool[sizeof(struct vnt_tx_mgmt)
+ WLAN_NULLDATA_FR_MAXLEN]; + WLAN_NULLDATA_FR_MAXLEN];
BOOL bRxBeaconInTBTTWake; int bRxBeaconInTBTTWake;
BYTE abyPSTxMap[MAX_NODE_NUM + 1]; u8 abyPSTxMap[MAX_NODE_NUM + 1];
// management command related /* management command related */
unsigned int uCmdBusy; u32 uCmdBusy;
unsigned int uCmdHostAPBusy; u32 uCmdHostAPBusy;
// management packet pool /* management packet pool */
PBYTE pbyMgmtPacketPool; u8 *pbyMgmtPacketPool;
u8 byMgmtPacketPool[sizeof(struct vnt_tx_mgmt) u8 byMgmtPacketPool[sizeof(struct vnt_tx_mgmt)
+ WLAN_A3FR_MAXLEN]; + WLAN_A3FR_MAXLEN];
// One second callback timer /* One second callback timer */
struct timer_list sTimerSecondCallback; struct timer_list sTimerSecondCallback;
/* Temporarily Rx Mgmt Packet Descriptor */ /* Temporarily Rx Mgmt Packet Descriptor */
struct vnt_rx_mgmt sRxPacket; struct vnt_rx_mgmt sRxPacket;
// link list of known bss's (scan results) /* link list of known bss's (scan results) */
KnownBSS sBSSList[MAX_BSS_NUM]; KnownBSS sBSSList[MAX_BSS_NUM];
/* link list of same bss's */ /* link list of same bss's */
KnownBSS pSameBSS[6] ; KnownBSS pSameBSS[6];
BOOL Cisco_cckm ; int Cisco_cckm;
BYTE Roam_dbm; u8 Roam_dbm;
// table list of known node /* table list of known node */
// sNodeDBList[0] is reserved for AP under Infra mode /* sNodeDBList[0] is reserved for AP under Infra mode */
// sNodeDBList[0] is reserved for Multicast under adhoc/AP mode /* sNodeDBList[0] is reserved for Multicast under adhoc/AP mode */
KnownNodeDB sNodeDBTable[MAX_NODE_NUM + 1]; KnownNodeDB sNodeDBTable[MAX_NODE_NUM + 1];
/* WPA2 PMKID Cache */
// WPA2 PMKID Cache
SPMKIDCache gsPMKIDCache; SPMKIDCache gsPMKIDCache;
BOOL bRoaming; int bRoaming;
// rate fall back vars /* associate info */
// associate info
SAssocInfo sAssocInfo; SAssocInfo sAssocInfo;
/* for 802.11h */
// for 802.11h int b11hEnable;
BOOL b11hEnable; int bSwitchChannel;
BOOL bSwitchChannel; u8 byNewChannel;
BYTE byNewChannel;
PWLAN_IE_MEASURE_REP pCurrMeasureEIDRep; PWLAN_IE_MEASURE_REP pCurrMeasureEIDRep;
unsigned int uLengthOfRepEIDs; u32 uLengthOfRepEIDs;
u8 abyCurrentMSRReq[sizeof(struct vnt_tx_mgmt) u8 abyCurrentMSRReq[sizeof(struct vnt_tx_mgmt)
+ WLAN_A3FR_MAXLEN]; + WLAN_A3FR_MAXLEN];
u8 abyCurrentMSRRep[sizeof(struct vnt_tx_mgmt) u8 abyCurrentMSRRep[sizeof(struct vnt_tx_mgmt)
+ WLAN_A3FR_MAXLEN]; + WLAN_A3FR_MAXLEN];
BYTE abyIECountry[WLAN_A3FR_MAXLEN]; u8 abyIECountry[WLAN_A3FR_MAXLEN];
BYTE abyIBSSDFSOwner[6]; u8 abyIBSSDFSOwner[6];
BYTE byIBSSDFSRecovery; u8 byIBSSDFSRecovery;
struct sk_buff skb; struct sk_buff skb;
......
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