Skip to content

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

staging: vt6655: channel/wcmd/wctl/wmgr use struct vnt_private * 

Replacing PSDevice.
Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d052270b
Hide whitespace changes
Inline Side-by-side
Showing with 87 additions and 85 deletions
drivers/staging/vt6655/channel.c
View file @ 0ffc5874
...@@ -416,7 +416,7 @@ bool channel_get_list(unsigned int uCountryCodeIdx, unsigned char *pbyChannelTab ...@@ -416,7 +416,7 @@ bool channel_get_list(unsigned int uCountryCodeIdx, unsigned char *pbyChannelTab
void init_channel_table(void *pDeviceHandler) void init_channel_table(void *pDeviceHandler)
{ {
PSDevice pDevice = (PSDevice) pDeviceHandler; struct vnt_private *pDevice = pDeviceHandler;
bool bMultiBand = false; bool bMultiBand = false;
unsigned int ii; unsigned int ii;
...@@ -521,7 +521,7 @@ unsigned char get_channel_number(void *pDeviceHandler, unsigned char byChannelIn ...@@ -521,7 +521,7 @@ unsigned char get_channel_number(void *pDeviceHandler, unsigned char byChannelIn
*/ */
bool set_channel(void *pDeviceHandler, unsigned int uConnectionChannel) bool set_channel(void *pDeviceHandler, unsigned int uConnectionChannel)
{ {
PSDevice pDevice = (PSDevice) pDeviceHandler; struct vnt_private *pDevice = pDeviceHandler;
bool bResult = true; bool bResult = true;
if (pDevice->byCurrentCh == uConnectionChannel) if (pDevice->byCurrentCh == uConnectionChannel)
...@@ -583,7 +583,7 @@ bool set_channel(void *pDeviceHandler, unsigned int uConnectionChannel) ...@@ -583,7 +583,7 @@ bool set_channel(void *pDeviceHandler, unsigned int uConnectionChannel)
void set_country_info(void *pDeviceHandler, CARD_PHY_TYPE ePHYType, void *pIE) void set_country_info(void *pDeviceHandler, CARD_PHY_TYPE ePHYType, void *pIE)
{ {
PSDevice pDevice = (PSDevice) pDeviceHandler; struct vnt_private *pDevice = pDeviceHandler;
unsigned int ii = 0; unsigned int ii = 0;
unsigned int uu = 0; unsigned int uu = 0;
unsigned int step = 0; unsigned int step = 0;
...@@ -632,7 +632,7 @@ void set_country_info(void *pDeviceHandler, CARD_PHY_TYPE ePHYType, void *pIE) ...@@ -632,7 +632,7 @@ void set_country_info(void *pDeviceHandler, CARD_PHY_TYPE ePHYType, void *pIE)
unsigned char set_support_channels(void *pDeviceHandler, unsigned char *pbyIEs) unsigned char set_support_channels(void *pDeviceHandler, unsigned char *pbyIEs)
{ {
PSDevice pDevice = (PSDevice) pDeviceHandler; struct vnt_private *pDevice = pDeviceHandler;
unsigned int ii; unsigned int ii;
unsigned char byCount; unsigned char byCount;
PWLAN_IE_SUPP_CH pIE = (PWLAN_IE_SUPP_CH) pbyIEs; PWLAN_IE_SUPP_CH pIE = (PWLAN_IE_SUPP_CH) pbyIEs;
...@@ -703,7 +703,7 @@ unsigned char set_support_channels(void *pDeviceHandler, unsigned char *pbyIEs) ...@@ -703,7 +703,7 @@ unsigned char set_support_channels(void *pDeviceHandler, unsigned char *pbyIEs)
void set_country_IE(void *pDeviceHandler, void *pIE) void set_country_IE(void *pDeviceHandler, void *pIE)
{ {
PSDevice pDevice = (PSDevice) pDeviceHandler; struct vnt_private *pDevice = pDeviceHandler;
unsigned int ii; unsigned int ii;
PWLAN_IE_COUNTRY pIECountry = (PWLAN_IE_COUNTRY) pIE; PWLAN_IE_COUNTRY pIECountry = (PWLAN_IE_COUNTRY) pIE;
......
drivers/staging/vt6655/wcmd.c
View file @ 0ffc5874
...@@ -65,13 +65,13 @@ static int msglevel = MSG_LEVEL_INFO; ...@@ -65,13 +65,13 @@ static int msglevel = MSG_LEVEL_INFO;
static static
void void
s_vProbeChannel( s_vProbeChannel(
PSDevice pDevice struct vnt_private *pDevice
); );
static static
PSTxMgmtPacket PSTxMgmtPacket
s_MgrMakeProbeRequest( s_MgrMakeProbeRequest(
PSDevice pDevice, struct vnt_private *pDevice,
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
unsigned char *pScanBSSID, unsigned char *pScanBSSID,
PWLAN_IE_SSID pSSID, PWLAN_IE_SSID pSSID,
...@@ -82,7 +82,7 @@ s_MgrMakeProbeRequest( ...@@ -82,7 +82,7 @@ s_MgrMakeProbeRequest(
static static
bool bool
s_bCommandComplete( s_bCommandComplete(
PSDevice pDevice struct vnt_private *pDevice
); );
/*--------------------- Export Variables --------------------------*/ /*--------------------- Export Variables --------------------------*/
...@@ -104,7 +104,7 @@ s_bCommandComplete( ...@@ -104,7 +104,7 @@ s_bCommandComplete(
*/ */
static static
void void
vAdHocBeaconStop(PSDevice pDevice) vAdHocBeaconStop(struct vnt_private *pDevice)
{ {
PSMgmtObject pMgmt = &(pDevice->sMgmtObj); PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
bool bStop; bool bStop;
...@@ -151,7 +151,7 @@ vAdHocBeaconStop(PSDevice pDevice) ...@@ -151,7 +151,7 @@ vAdHocBeaconStop(PSDevice pDevice)
*/ */
static static
void void
vAdHocBeaconRestart(PSDevice pDevice) vAdHocBeaconRestart(struct vnt_private *pDevice)
{ {
PSMgmtObject pMgmt = &(pDevice->sMgmtObj); PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
...@@ -181,7 +181,7 @@ vAdHocBeaconRestart(PSDevice pDevice) ...@@ -181,7 +181,7 @@ vAdHocBeaconRestart(PSDevice pDevice)
static static
void void
s_vProbeChannel( s_vProbeChannel(
PSDevice pDevice struct vnt_private *pDevice
) )
{ {
//1M, 2M, 5M, 11M, 18M, 24M, 36M, 54M //1M, 2M, 5M, 11M, 18M, 24M, 36M, 54M
...@@ -236,7 +236,7 @@ s_vProbeChannel( ...@@ -236,7 +236,7 @@ s_vProbeChannel(
static PSTxMgmtPacket static PSTxMgmtPacket
s_MgrMakeProbeRequest( s_MgrMakeProbeRequest(
PSDevice pDevice, struct vnt_private *pDevice,
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
unsigned char *pScanBSSID, unsigned char *pScanBSSID,
PWLAN_IE_SSID pSSID, PWLAN_IE_SSID pSSID,
...@@ -287,7 +287,7 @@ vCommandTimerWait( ...@@ -287,7 +287,7 @@ vCommandTimerWait(
unsigned int MSecond unsigned int MSecond
) )
{ {
PSDevice pDevice = (PSDevice)hDeviceContext; struct vnt_private *pDevice = hDeviceContext;
init_timer(&pDevice->sTimerCommand); init_timer(&pDevice->sTimerCommand);
pDevice->sTimerCommand.data = (unsigned long) pDevice; pDevice->sTimerCommand.data = (unsigned long) pDevice;
...@@ -302,7 +302,7 @@ vCommandTimer( ...@@ -302,7 +302,7 @@ vCommandTimer(
void *hDeviceContext void *hDeviceContext
) )
{ {
PSDevice pDevice = (PSDevice)hDeviceContext; struct vnt_private *pDevice = hDeviceContext;
PSMgmtObject pMgmt = pDevice->pMgmt; PSMgmtObject pMgmt = pDevice->pMgmt;
PWLAN_IE_SSID pItemSSID; PWLAN_IE_SSID pItemSSID;
PWLAN_IE_SSID pItemSSIDCurr; PWLAN_IE_SSID pItemSSIDCurr;
...@@ -801,7 +801,7 @@ vCommandTimer( ...@@ -801,7 +801,7 @@ vCommandTimer(
static static
bool bool
s_bCommandComplete( s_bCommandComplete(
PSDevice pDevice struct vnt_private *pDevice
) )
{ {
PWLAN_IE_SSID pSSID; PWLAN_IE_SSID pSSID;
...@@ -875,7 +875,7 @@ bool bScheduleCommand( ...@@ -875,7 +875,7 @@ bool bScheduleCommand(
unsigned char *pbyItem0 unsigned char *pbyItem0
) )
{ {
PSDevice pDevice = (PSDevice)hDeviceContext; struct vnt_private *pDevice = hDeviceContext;
if (pDevice->cbFreeCmdQueue == 0) if (pDevice->cbFreeCmdQueue == 0)
return false; return false;
...@@ -944,7 +944,7 @@ bool bClearBSSID_SCAN( ...@@ -944,7 +944,7 @@ bool bClearBSSID_SCAN(
void *hDeviceContext void *hDeviceContext
) )
{ {
PSDevice pDevice = (PSDevice)hDeviceContext; struct vnt_private *pDevice = hDeviceContext;
unsigned int uCmdDequeueIdx = pDevice->uCmdDequeueIdx; unsigned int uCmdDequeueIdx = pDevice->uCmdDequeueIdx;
unsigned int ii; unsigned int ii;
...@@ -966,7 +966,7 @@ vResetCommandTimer( ...@@ -966,7 +966,7 @@ vResetCommandTimer(
void *hDeviceContext void *hDeviceContext
) )
{ {
PSDevice pDevice = (PSDevice)hDeviceContext; struct vnt_private *pDevice = hDeviceContext;
//delete timer //delete timer
del_timer(&pDevice->sTimerCommand); del_timer(&pDevice->sTimerCommand);
...@@ -988,7 +988,7 @@ BSSvSecondTxData( ...@@ -988,7 +988,7 @@ BSSvSecondTxData(
void *hDeviceContext void *hDeviceContext
) )
{ {
PSDevice pDevice = (PSDevice)hDeviceContext; struct vnt_private *pDevice = hDeviceContext;
PSMgmtObject pMgmt = &(pDevice->sMgmtObj); PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
pDevice->nTxDataTimeCout++; pDevice->nTxDataTimeCout++;
......
drivers/staging/vt6655/wctl.c
View file @ 0ffc5874
...@@ -105,7 +105,8 @@ bool WCTLbIsDuplicate(PSCache pCache, PS802_11Header pMACHeader) ...@@ -105,7 +105,8 @@ bool WCTLbIsDuplicate(PSCache pCache, PS802_11Header pMACHeader)
* Return Value: index number in Defragment Database * Return Value: index number in Defragment Database
* *
*/ */
unsigned int WCTLuSearchDFCB(PSDevice pDevice, PS802_11Header pMACHeader) unsigned int WCTLuSearchDFCB(struct vnt_private *pDevice,
PS802_11Header pMACHeader)
{ {
unsigned int ii; unsigned int ii;
...@@ -133,7 +134,7 @@ unsigned int WCTLuSearchDFCB(PSDevice pDevice, PS802_11Header pMACHeader) ...@@ -133,7 +134,7 @@ unsigned int WCTLuSearchDFCB(PSDevice pDevice, PS802_11Header pMACHeader)
* Return Value: index number in Defragment Database * Return Value: index number in Defragment Database
* *
*/ */
unsigned int WCTLuInsertDFCB(PSDevice pDevice, PS802_11Header pMACHeader) unsigned int WCTLuInsertDFCB(struct vnt_private *pDevice, PS802_11Header pMACHeader)
{ {
unsigned int ii; unsigned int ii;
...@@ -169,7 +170,8 @@ unsigned int WCTLuInsertDFCB(PSDevice pDevice, PS802_11Header pMACHeader) ...@@ -169,7 +170,8 @@ unsigned int WCTLuInsertDFCB(PSDevice pDevice, PS802_11Header pMACHeader)
* Return Value: true if it is valid fragment packet and we have resource to defragment; otherwise false * Return Value: true if it is valid fragment packet and we have resource to defragment; otherwise false
* *
*/ */
bool WCTLbHandleFragment(PSDevice pDevice, PS802_11Header pMACHeader, unsigned int cbFrameLength, bool bWEP, bool bExtIV) bool WCTLbHandleFragment(struct vnt_private *pDevice, PS802_11Header pMACHeader,
unsigned int cbFrameLength, bool bWEP, bool bExtIV)
{ {
unsigned int uHeaderSize; unsigned int uHeaderSize;
......
drivers/staging/vt6655/wctl.h
View file @ 0ffc5874
...@@ -97,9 +97,9 @@ do { \ ...@@ -97,9 +97,9 @@ do { \
/*--------------------- Export Functions --------------------------*/ /*--------------------- Export Functions --------------------------*/
bool WCTLbIsDuplicate(PSCache pCache, PS802_11Header pMACHeader); bool WCTLbIsDuplicate(PSCache pCache, PS802_11Header pMACHeader);
bool WCTLbHandleFragment(PSDevice pDevice, PS802_11Header pMACHeader, bool WCTLbHandleFragment(struct vnt_private *, PS802_11Header pMACHeader,
unsigned int cbFrameLength, bool bWEP, bool bExtIV); unsigned int cbFrameLength, bool bWEP, bool bExtIV);
unsigned int WCTLuSearchDFCB(PSDevice pDevice, PS802_11Header pMACHeader); unsigned int WCTLuSearchDFCB(struct vnt_private *, PS802_11Header pMACHeader);
unsigned int WCTLuInsertDFCB(PSDevice pDevice, PS802_11Header pMACHeader); unsigned int WCTLuInsertDFCB(struct vnt_private *, PS802_11Header pMACHeader);
#endif // __WCTL_H__ #endif // __WCTL_H__
drivers/staging/vt6655/wmgr.c
View file @ 0ffc5874
...@@ -92,7 +92,7 @@ static int msglevel = MSG_LEVEL_INFO; ...@@ -92,7 +92,7 @@ static int msglevel = MSG_LEVEL_INFO;
/*--------------------- Static Functions --------------------------*/ /*--------------------- Static Functions --------------------------*/
//2008-8-4 <add> by chester //2008-8-4 <add> by chester
static bool ChannelExceedZoneType( static bool ChannelExceedZoneType(
PSDevice pDevice, struct vnt_private *pDevice,
unsigned char byCurrChannel unsigned char byCurrChannel
); );
...@@ -100,7 +100,7 @@ static bool ChannelExceedZoneType( ...@@ -100,7 +100,7 @@ static bool ChannelExceedZoneType(
static static
PSTxMgmtPacket PSTxMgmtPacket
s_MgrMakeAssocRequest( s_MgrMakeAssocRequest(
PSDevice pDevice, struct vnt_private *pDevice,
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
unsigned char *pDAddr, unsigned char *pDAddr,
unsigned short wCurrCapInfo, unsigned short wCurrCapInfo,
...@@ -113,7 +113,7 @@ s_MgrMakeAssocRequest( ...@@ -113,7 +113,7 @@ s_MgrMakeAssocRequest(
static static
void void
s_vMgrRxAssocRequest( s_vMgrRxAssocRequest(
PSDevice pDevice, struct vnt_private *pDevice,
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
PSRxMgmtPacket pRxPacket, PSRxMgmtPacket pRxPacket,
unsigned int uNodeIndex unsigned int uNodeIndex
...@@ -122,7 +122,7 @@ s_vMgrRxAssocRequest( ...@@ -122,7 +122,7 @@ s_vMgrRxAssocRequest(
static static
PSTxMgmtPacket PSTxMgmtPacket
s_MgrMakeReAssocRequest( s_MgrMakeReAssocRequest(
PSDevice pDevice, struct vnt_private *pDevice,
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
unsigned char *pDAddr, unsigned char *pDAddr,
unsigned short wCurrCapInfo, unsigned short wCurrCapInfo,
...@@ -135,7 +135,7 @@ s_MgrMakeReAssocRequest( ...@@ -135,7 +135,7 @@ s_MgrMakeReAssocRequest(
static static
void void
s_vMgrRxAssocResponse( s_vMgrRxAssocResponse(
PSDevice pDevice, struct vnt_private *pDevice,
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
PSRxMgmtPacket pRxPacket, PSRxMgmtPacket pRxPacket,
bool bReAssocType bool bReAssocType
...@@ -144,7 +144,7 @@ s_vMgrRxAssocResponse( ...@@ -144,7 +144,7 @@ s_vMgrRxAssocResponse(
static static
void void
s_vMgrRxDisassociation( s_vMgrRxDisassociation(
PSDevice pDevice, struct vnt_private *pDevice,
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
PSRxMgmtPacket pRxPacket PSRxMgmtPacket pRxPacket
); );
...@@ -153,7 +153,7 @@ s_vMgrRxDisassociation( ...@@ -153,7 +153,7 @@ s_vMgrRxDisassociation(
static static
void void
s_vMgrRxAuthenSequence_1( s_vMgrRxAuthenSequence_1(
PSDevice pDevice, struct vnt_private *pDevice,
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
PWLAN_FR_AUTHEN pFrame PWLAN_FR_AUTHEN pFrame
); );
...@@ -161,7 +161,7 @@ s_vMgrRxAuthenSequence_1( ...@@ -161,7 +161,7 @@ s_vMgrRxAuthenSequence_1(
static static
void void
s_vMgrRxAuthenSequence_2( s_vMgrRxAuthenSequence_2(
PSDevice pDevice, struct vnt_private *pDevice,
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
PWLAN_FR_AUTHEN pFrame PWLAN_FR_AUTHEN pFrame
); );
...@@ -169,7 +169,7 @@ s_vMgrRxAuthenSequence_2( ...@@ -169,7 +169,7 @@ s_vMgrRxAuthenSequence_2(
static static
void void
s_vMgrRxAuthenSequence_3( s_vMgrRxAuthenSequence_3(
PSDevice pDevice, struct vnt_private *pDevice,
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
PWLAN_FR_AUTHEN pFrame PWLAN_FR_AUTHEN pFrame
); );
...@@ -177,7 +177,7 @@ s_vMgrRxAuthenSequence_3( ...@@ -177,7 +177,7 @@ s_vMgrRxAuthenSequence_3(
static static
void void
s_vMgrRxAuthenSequence_4( s_vMgrRxAuthenSequence_4(
PSDevice pDevice, struct vnt_private *pDevice,
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
PWLAN_FR_AUTHEN pFrame PWLAN_FR_AUTHEN pFrame
); );
...@@ -185,7 +185,7 @@ s_vMgrRxAuthenSequence_4( ...@@ -185,7 +185,7 @@ s_vMgrRxAuthenSequence_4(
static static
void void
s_vMgrRxAuthentication( s_vMgrRxAuthentication(
PSDevice pDevice, struct vnt_private *pDevice,
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
PSRxMgmtPacket pRxPacket PSRxMgmtPacket pRxPacket
); );
...@@ -193,7 +193,7 @@ s_vMgrRxAuthentication( ...@@ -193,7 +193,7 @@ s_vMgrRxAuthentication(
static static
void void
s_vMgrRxDeauthentication( s_vMgrRxDeauthentication(
PSDevice pDevice, struct vnt_private *pDevice,
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
PSRxMgmtPacket pRxPacket PSRxMgmtPacket pRxPacket
); );
...@@ -203,7 +203,7 @@ s_vMgrRxDeauthentication( ...@@ -203,7 +203,7 @@ s_vMgrRxDeauthentication(
static static
void void
s_vMgrRxProbeRequest( s_vMgrRxProbeRequest(
PSDevice pDevice, struct vnt_private *pDevice,
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
PSRxMgmtPacket pRxPacket PSRxMgmtPacket pRxPacket
); );
...@@ -211,7 +211,7 @@ s_vMgrRxProbeRequest( ...@@ -211,7 +211,7 @@ s_vMgrRxProbeRequest(
static static
void void
s_vMgrRxProbeResponse( s_vMgrRxProbeResponse(
PSDevice pDevice, struct vnt_private *pDevice,
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
PSRxMgmtPacket pRxPacket PSRxMgmtPacket pRxPacket
); );
...@@ -220,7 +220,7 @@ s_vMgrRxProbeResponse( ...@@ -220,7 +220,7 @@ s_vMgrRxProbeResponse(
static static
void void
s_vMgrRxBeacon( s_vMgrRxBeacon(
PSDevice pDevice, struct vnt_private *pDevice,
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
PSRxMgmtPacket pRxPacket, PSRxMgmtPacket pRxPacket,
bool bInScan bool bInScan
...@@ -236,7 +236,7 @@ s_vMgrFormatTIM( ...@@ -236,7 +236,7 @@ s_vMgrFormatTIM(
static static
PSTxMgmtPacket PSTxMgmtPacket
s_MgrMakeBeacon( s_MgrMakeBeacon(
PSDevice pDevice, struct vnt_private *pDevice,
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
unsigned short wCurrCapInfo, unsigned short wCurrCapInfo,
unsigned short wCurrBeaconPeriod, unsigned short wCurrBeaconPeriod,
...@@ -252,7 +252,7 @@ s_MgrMakeBeacon( ...@@ -252,7 +252,7 @@ s_MgrMakeBeacon(
static static
PSTxMgmtPacket PSTxMgmtPacket
s_MgrMakeAssocResponse( s_MgrMakeAssocResponse(
PSDevice pDevice, struct vnt_private *pDevice,
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
unsigned short wCurrCapInfo, unsigned short wCurrCapInfo,
unsigned short wAssocStatus, unsigned short wAssocStatus,
...@@ -266,7 +266,7 @@ s_MgrMakeAssocResponse( ...@@ -266,7 +266,7 @@ s_MgrMakeAssocResponse(
static static
PSTxMgmtPacket PSTxMgmtPacket
s_MgrMakeReAssocResponse( s_MgrMakeReAssocResponse(
PSDevice pDevice, struct vnt_private *pDevice,
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
unsigned short wCurrCapInfo, unsigned short wCurrCapInfo,
unsigned short wAssocStatus, unsigned short wAssocStatus,
...@@ -280,7 +280,7 @@ s_MgrMakeReAssocResponse( ...@@ -280,7 +280,7 @@ s_MgrMakeReAssocResponse(
static static
PSTxMgmtPacket PSTxMgmtPacket
s_MgrMakeProbeResponse( s_MgrMakeProbeResponse(
PSDevice pDevice, struct vnt_private *pDevice,
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
unsigned short wCurrCapInfo, unsigned short wCurrCapInfo,
unsigned short wCurrBeaconPeriod, unsigned short wCurrBeaconPeriod,
...@@ -305,7 +305,7 @@ s_vMgrLogStatus( ...@@ -305,7 +305,7 @@ s_vMgrLogStatus(
static static
void void
s_vMgrSynchBSS( s_vMgrSynchBSS(
PSDevice pDevice, struct vnt_private *pDevice,
unsigned int uBSSMode, unsigned int uBSSMode,
PKnownBSS pCurr, PKnownBSS pCurr,
PCMD_STATUS pStatus PCMD_STATUS pStatus
...@@ -320,7 +320,7 @@ s_bCipherMatch( ...@@ -320,7 +320,7 @@ s_bCipherMatch(
); );
static void Encyption_Rebuild( static void Encyption_Rebuild(
PSDevice pDevice, struct vnt_private *pDevice,
PKnownBSS pCurr PKnownBSS pCurr
); );
...@@ -343,7 +343,7 @@ vMgrObjectInit( ...@@ -343,7 +343,7 @@ vMgrObjectInit(
void *hDeviceContext void *hDeviceContext
) )
{ {
PSDevice pDevice = (PSDevice)hDeviceContext; struct vnt_private *pDevice = hDeviceContext;
PSMgmtObject pMgmt = pDevice->pMgmt; PSMgmtObject pMgmt = pDevice->pMgmt;
int ii; int ii;
...@@ -375,7 +375,7 @@ vMgrTimerInit( ...@@ -375,7 +375,7 @@ vMgrTimerInit(
void *hDeviceContext void *hDeviceContext
) )
{ {
PSDevice pDevice = (PSDevice)hDeviceContext; struct vnt_private *pDevice = hDeviceContext;
PSMgmtObject pMgmt = pDevice->pMgmt; PSMgmtObject pMgmt = pDevice->pMgmt;
init_timer(&pMgmt->sTimerSecondCallback); init_timer(&pMgmt->sTimerSecondCallback);
...@@ -416,7 +416,7 @@ vMgrObjectReset( ...@@ -416,7 +416,7 @@ vMgrObjectReset(
void *hDeviceContext void *hDeviceContext
) )
{ {
PSDevice pDevice = (PSDevice)hDeviceContext; struct vnt_private *pDevice = hDeviceContext;
PSMgmtObject pMgmt = pDevice->pMgmt; PSMgmtObject pMgmt = pDevice->pMgmt;
pMgmt->eCurrMode = WMAC_MODE_STANDBY; pMgmt->eCurrMode = WMAC_MODE_STANDBY;
...@@ -443,7 +443,7 @@ vMgrAssocBeginSta( ...@@ -443,7 +443,7 @@ vMgrAssocBeginSta(
PCMD_STATUS pStatus PCMD_STATUS pStatus
) )
{ {
PSDevice pDevice = (PSDevice)hDeviceContext; struct vnt_private *pDevice = hDeviceContext;
PSTxMgmtPacket pTxPacket; PSTxMgmtPacket pTxPacket;
pMgmt->wCurrCapInfo = 0; pMgmt->wCurrCapInfo = 0;
...@@ -509,7 +509,7 @@ vMgrReAssocBeginSta( ...@@ -509,7 +509,7 @@ vMgrReAssocBeginSta(
PCMD_STATUS pStatus PCMD_STATUS pStatus
) )
{ {
PSDevice pDevice = (PSDevice)hDeviceContext; struct vnt_private *pDevice = hDeviceContext;
PSTxMgmtPacket pTxPacket; PSTxMgmtPacket pTxPacket;
pMgmt->wCurrCapInfo = 0; pMgmt->wCurrCapInfo = 0;
...@@ -576,7 +576,7 @@ vMgrDisassocBeginSta( ...@@ -576,7 +576,7 @@ vMgrDisassocBeginSta(
PCMD_STATUS pStatus PCMD_STATUS pStatus
) )
{ {
PSDevice pDevice = (PSDevice)hDeviceContext; struct vnt_private *pDevice = hDeviceContext;
PSTxMgmtPacket pTxPacket = NULL; PSTxMgmtPacket pTxPacket = NULL;
WLAN_FR_DISASSOC sFrame; WLAN_FR_DISASSOC sFrame;
...@@ -628,7 +628,7 @@ vMgrDisassocBeginSta( ...@@ -628,7 +628,7 @@ vMgrDisassocBeginSta(
static static
void void
s_vMgrRxAssocRequest( s_vMgrRxAssocRequest(
PSDevice pDevice, struct vnt_private *pDevice,
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
PSRxMgmtPacket pRxPacket, PSRxMgmtPacket pRxPacket,
unsigned int uNodeIndex unsigned int uNodeIndex
...@@ -778,7 +778,7 @@ s_vMgrRxAssocRequest( ...@@ -778,7 +778,7 @@ s_vMgrRxAssocRequest(
static static
void void
s_vMgrRxReAssocRequest( s_vMgrRxReAssocRequest(
PSDevice pDevice, struct vnt_private *pDevice,
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
PSRxMgmtPacket pRxPacket, PSRxMgmtPacket pRxPacket,
unsigned int uNodeIndex unsigned int uNodeIndex
...@@ -920,7 +920,7 @@ s_vMgrRxReAssocRequest( ...@@ -920,7 +920,7 @@ s_vMgrRxReAssocRequest(
static static
void void
s_vMgrRxAssocResponse( s_vMgrRxAssocResponse(
PSDevice pDevice, struct vnt_private *pDevice,
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
PSRxMgmtPacket pRxPacket, PSRxMgmtPacket pRxPacket,
bool bReAssocType bool bReAssocType
...@@ -1073,7 +1073,7 @@ vMgrAuthenBeginSta( ...@@ -1073,7 +1073,7 @@ vMgrAuthenBeginSta(
PCMD_STATUS pStatus PCMD_STATUS pStatus
) )
{ {
PSDevice pDevice = (PSDevice)hDeviceContext; struct vnt_private *pDevice = hDeviceContext;
WLAN_FR_AUTHEN sFrame; WLAN_FR_AUTHEN sFrame;
PSTxMgmtPacket pTxPacket = NULL; PSTxMgmtPacket pTxPacket = NULL;
...@@ -1129,7 +1129,7 @@ vMgrDeAuthenBeginSta( ...@@ -1129,7 +1129,7 @@ vMgrDeAuthenBeginSta(
PCMD_STATUS pStatus PCMD_STATUS pStatus
) )
{ {
PSDevice pDevice = (PSDevice)hDeviceContext; struct vnt_private *pDevice = hDeviceContext;
WLAN_FR_DEAUTHEN sFrame; WLAN_FR_DEAUTHEN sFrame;
PSTxMgmtPacket pTxPacket = NULL; PSTxMgmtPacket pTxPacket = NULL;
...@@ -1173,7 +1173,7 @@ vMgrDeAuthenBeginSta( ...@@ -1173,7 +1173,7 @@ vMgrDeAuthenBeginSta(
static static
void void
s_vMgrRxAuthentication( s_vMgrRxAuthentication(
PSDevice pDevice, struct vnt_private *pDevice,
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
PSRxMgmtPacket pRxPacket PSRxMgmtPacket pRxPacket
) )
...@@ -1227,7 +1227,7 @@ s_vMgrRxAuthentication( ...@@ -1227,7 +1227,7 @@ s_vMgrRxAuthentication(
static static
void void
s_vMgrRxAuthenSequence_1( s_vMgrRxAuthenSequence_1(
PSDevice pDevice, struct vnt_private *pDevice,
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
PWLAN_FR_AUTHEN pFrame PWLAN_FR_AUTHEN pFrame
) )
...@@ -1239,7 +1239,7 @@ s_vMgrRxAuthenSequence_1( ...@@ -1239,7 +1239,7 @@ s_vMgrRxAuthenSequence_1(
// Insert a Node entry // Insert a Node entry
if (!BSSDBbIsSTAInNodeDB(pMgmt, pFrame->pHdr->sA3.abyAddr2, &uNodeIndex)) { if (!BSSDBbIsSTAInNodeDB(pMgmt, pFrame->pHdr->sA3.abyAddr2, &uNodeIndex)) {
BSSvCreateOneNode((PSDevice)pDevice, &uNodeIndex); BSSvCreateOneNode(pDevice, &uNodeIndex);
memcpy(pMgmt->sNodeDBTable[uNodeIndex].abyMACAddr, pFrame->pHdr->sA3.abyAddr2, memcpy(pMgmt->sNodeDBTable[uNodeIndex].abyMACAddr, pFrame->pHdr->sA3.abyAddr2,
WLAN_ADDR_LEN); WLAN_ADDR_LEN);
} }
...@@ -1326,7 +1326,7 @@ s_vMgrRxAuthenSequence_1( ...@@ -1326,7 +1326,7 @@ s_vMgrRxAuthenSequence_1(
static static
void void
s_vMgrRxAuthenSequence_2( s_vMgrRxAuthenSequence_2(
PSDevice pDevice, struct vnt_private *pDevice,
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
PWLAN_FR_AUTHEN pFrame PWLAN_FR_AUTHEN pFrame
) )
...@@ -1411,7 +1411,7 @@ s_vMgrRxAuthenSequence_2( ...@@ -1411,7 +1411,7 @@ s_vMgrRxAuthenSequence_2(
static static
void void
s_vMgrRxAuthenSequence_3( s_vMgrRxAuthenSequence_3(
PSDevice pDevice, struct vnt_private *pDevice,
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
PWLAN_FR_AUTHEN pFrame PWLAN_FR_AUTHEN pFrame
) )
...@@ -1493,7 +1493,7 @@ s_vMgrRxAuthenSequence_3( ...@@ -1493,7 +1493,7 @@ s_vMgrRxAuthenSequence_3(
static static
void void
s_vMgrRxAuthenSequence_4( s_vMgrRxAuthenSequence_4(
PSDevice pDevice, struct vnt_private *pDevice,
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
PWLAN_FR_AUTHEN pFrame PWLAN_FR_AUTHEN pFrame
) )
...@@ -1523,7 +1523,7 @@ s_vMgrRxAuthenSequence_4( ...@@ -1523,7 +1523,7 @@ s_vMgrRxAuthenSequence_4(
static static
void void
s_vMgrRxDisassociation( s_vMgrRxDisassociation(
PSDevice pDevice, struct vnt_private *pDevice,
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
PSRxMgmtPacket pRxPacket PSRxMgmtPacket pRxPacket
) )
...@@ -1593,7 +1593,7 @@ s_vMgrRxDisassociation( ...@@ -1593,7 +1593,7 @@ s_vMgrRxDisassociation(
static static
void void
s_vMgrRxDeauthentication( s_vMgrRxDeauthentication(
PSDevice pDevice, struct vnt_private *pDevice,
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
PSRxMgmtPacket pRxPacket PSRxMgmtPacket pRxPacket
) )
...@@ -1676,7 +1676,7 @@ s_vMgrRxDeauthentication( ...@@ -1676,7 +1676,7 @@ s_vMgrRxDeauthentication(
-*/ -*/
static bool static bool
ChannelExceedZoneType( ChannelExceedZoneType(
PSDevice pDevice, struct vnt_private *pDevice,
unsigned char byCurrChannel unsigned char byCurrChannel
) )
{ {
...@@ -1713,7 +1713,7 @@ ChannelExceedZoneType( ...@@ -1713,7 +1713,7 @@ ChannelExceedZoneType(
static static
void void
s_vMgrRxBeacon( s_vMgrRxBeacon(
PSDevice pDevice, struct vnt_private *pDevice,
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
PSRxMgmtPacket pRxPacket, PSRxMgmtPacket pRxPacket,
bool bInScan bool bInScan
...@@ -2026,7 +2026,7 @@ s_vMgrRxBeacon( ...@@ -2026,7 +2026,7 @@ s_vMgrRxBeacon(
// send out ps-poll packet // send out ps-poll packet
if (pMgmt->bInTIM) if (pMgmt->bInTIM)
PSvSendPSPOLL((PSDevice)pDevice); PSvSendPSPOLL(pDevice);
} else { } else {
pMgmt->bInTIMWake = false; pMgmt->bInTIMWake = false;
...@@ -2077,7 +2077,7 @@ s_vMgrRxBeacon( ...@@ -2077,7 +2077,7 @@ s_vMgrRxBeacon(
pMgmt->sNodeDBTable[uNodeIndex].uInActiveCount = 0; pMgmt->sNodeDBTable[uNodeIndex].uInActiveCount = 0;
} else { } else {
// Todo, initial Node content // Todo, initial Node content
BSSvCreateOneNode((PSDevice)pDevice, &uNodeIndex); BSSvCreateOneNode(pDevice, &uNodeIndex);
pMgmt->abyCurrSuppRates[1] = RATEuSetIE((PWLAN_IE_SUPP_RATES)sFrame.pSuppRates, pMgmt->abyCurrSuppRates[1] = RATEuSetIE((PWLAN_IE_SUPP_RATES)sFrame.pSuppRates,
(PWLAN_IE_SUPP_RATES)pMgmt->abyCurrSuppRates, (PWLAN_IE_SUPP_RATES)pMgmt->abyCurrSuppRates,
...@@ -2178,7 +2178,7 @@ vMgrCreateOwnIBSS( ...@@ -2178,7 +2178,7 @@ vMgrCreateOwnIBSS(
PCMD_STATUS pStatus PCMD_STATUS pStatus
) )
{ {
PSDevice pDevice = (PSDevice)hDeviceContext; struct vnt_private *pDevice = hDeviceContext;
PSMgmtObject pMgmt = pDevice->pMgmt; PSMgmtObject pMgmt = pDevice->pMgmt;
unsigned short wMaxBasicRate; unsigned short wMaxBasicRate;
unsigned short wMaxSuppRate; unsigned short wMaxSuppRate;
...@@ -2414,7 +2414,7 @@ vMgrJoinBSSBegin( ...@@ -2414,7 +2414,7 @@ vMgrJoinBSSBegin(
PCMD_STATUS pStatus PCMD_STATUS pStatus
) )
{ {
PSDevice pDevice = (PSDevice)hDeviceContext; struct vnt_private *pDevice = hDeviceContext;
PSMgmtObject pMgmt = pDevice->pMgmt; PSMgmtObject pMgmt = pDevice->pMgmt;
PKnownBSS pCurr = NULL; PKnownBSS pCurr = NULL;
unsigned int ii, uu; unsigned int ii, uu;
...@@ -2629,7 +2629,7 @@ vMgrJoinBSSBegin( ...@@ -2629,7 +2629,7 @@ vMgrJoinBSSBegin(
static static
void void
s_vMgrSynchBSS( s_vMgrSynchBSS(
PSDevice pDevice, struct vnt_private *pDevice,
unsigned int uBSSMode, unsigned int uBSSMode,
PKnownBSS pCurr, PKnownBSS pCurr,
PCMD_STATUS pStatus PCMD_STATUS pStatus
...@@ -2767,7 +2767,7 @@ s_vMgrSynchBSS( ...@@ -2767,7 +2767,7 @@ s_vMgrSynchBSS(
//mike add: fix NetworkManager 0.7.0 hidden ssid mode in WPA encryption //mike add: fix NetworkManager 0.7.0 hidden ssid mode in WPA encryption
// ,need reset eAuthenMode and eEncryptionStatus // ,need reset eAuthenMode and eEncryptionStatus
static void Encyption_Rebuild( static void Encyption_Rebuild(
PSDevice pDevice, struct vnt_private *pDevice,
PKnownBSS pCurr PKnownBSS pCurr
) )
{ {
...@@ -2882,7 +2882,7 @@ s_vMgrFormatTIM( ...@@ -2882,7 +2882,7 @@ s_vMgrFormatTIM(
static static
PSTxMgmtPacket PSTxMgmtPacket
s_MgrMakeBeacon( s_MgrMakeBeacon(
PSDevice pDevice, struct vnt_private *pDevice,
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
unsigned short wCurrCapInfo, unsigned short wCurrCapInfo,
unsigned short wCurrBeaconPeriod, unsigned short wCurrBeaconPeriod,
...@@ -3101,7 +3101,7 @@ s_MgrMakeBeacon( ...@@ -3101,7 +3101,7 @@ s_MgrMakeBeacon(
static PSTxMgmtPacket static PSTxMgmtPacket
s_MgrMakeProbeResponse( s_MgrMakeProbeResponse(
PSDevice pDevice, struct vnt_private *pDevice,
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
unsigned short wCurrCapInfo, unsigned short wCurrCapInfo,
unsigned short wCurrBeaconPeriod, unsigned short wCurrBeaconPeriod,
...@@ -3283,7 +3283,7 @@ s_MgrMakeProbeResponse( ...@@ -3283,7 +3283,7 @@ s_MgrMakeProbeResponse(
static PSTxMgmtPacket static PSTxMgmtPacket
s_MgrMakeAssocRequest( s_MgrMakeAssocRequest(
PSDevice pDevice, struct vnt_private *pDevice,
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
unsigned char *pDAddr, unsigned char *pDAddr,
unsigned short wCurrCapInfo, unsigned short wCurrCapInfo,
...@@ -3543,7 +3543,7 @@ s_MgrMakeAssocRequest( ...@@ -3543,7 +3543,7 @@ s_MgrMakeAssocRequest(
static PSTxMgmtPacket static PSTxMgmtPacket
s_MgrMakeReAssocRequest( s_MgrMakeReAssocRequest(
PSDevice pDevice, struct vnt_private *pDevice,
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
unsigned char *pDAddr, unsigned char *pDAddr,
unsigned short wCurrCapInfo, unsigned short wCurrCapInfo,
...@@ -3788,7 +3788,7 @@ s_MgrMakeReAssocRequest( ...@@ -3788,7 +3788,7 @@ s_MgrMakeReAssocRequest(
static PSTxMgmtPacket static PSTxMgmtPacket
s_MgrMakeAssocResponse( s_MgrMakeAssocResponse(
PSDevice pDevice, struct vnt_private *pDevice,
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
unsigned short wCurrCapInfo, unsigned short wCurrCapInfo,
unsigned short wAssocStatus, unsigned short wAssocStatus,
...@@ -3859,7 +3859,7 @@ s_MgrMakeAssocResponse( ...@@ -3859,7 +3859,7 @@ s_MgrMakeAssocResponse(
static PSTxMgmtPacket static PSTxMgmtPacket
s_MgrMakeReAssocResponse( s_MgrMakeReAssocResponse(
PSDevice pDevice, struct vnt_private *pDevice,
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
unsigned short wCurrCapInfo, unsigned short wCurrCapInfo,
unsigned short wAssocStatus, unsigned short wAssocStatus,
...@@ -3931,7 +3931,7 @@ s_MgrMakeReAssocResponse( ...@@ -3931,7 +3931,7 @@ s_MgrMakeReAssocResponse(
static static
void void
s_vMgrRxProbeResponse( s_vMgrRxProbeResponse(
PSDevice pDevice, struct vnt_private *pDevice,
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
PSRxMgmtPacket pRxPacket PSRxMgmtPacket pRxPacket
) )
...@@ -4050,7 +4050,7 @@ s_vMgrRxProbeResponse( ...@@ -4050,7 +4050,7 @@ s_vMgrRxProbeResponse(
static static
void void
s_vMgrRxProbeRequest( s_vMgrRxProbeRequest(
PSDevice pDevice, struct vnt_private *pDevice,
PSMgmtObject pMgmt, PSMgmtObject pMgmt,
PSRxMgmtPacket pRxPacket PSRxMgmtPacket pRxPacket
) )
...@@ -4129,7 +4129,7 @@ vMgrRxManagePacket( ...@@ -4129,7 +4129,7 @@ vMgrRxManagePacket(
PSRxMgmtPacket pRxPacket PSRxMgmtPacket pRxPacket
) )
{ {
PSDevice pDevice = (PSDevice)hDeviceContext; struct vnt_private *pDevice = hDeviceContext;
bool bInScan = false; bool bInScan = false;
unsigned int uNodeIndex = 0; unsigned int uNodeIndex = 0;
NODE_STATE eNodeState = 0; NODE_STATE eNodeState = 0;
...@@ -4267,7 +4267,7 @@ bMgrPrepareBeaconToSend( ...@@ -4267,7 +4267,7 @@ bMgrPrepareBeaconToSend(
PSMgmtObject pMgmt PSMgmtObject pMgmt
) )
{ {
PSDevice pDevice = (PSDevice)hDeviceContext; struct vnt_private *pDevice = hDeviceContext;
PSTxMgmtPacket pTxPacket; PSTxMgmtPacket pTxPacket;
if (pDevice->bEncryptionEnable || pDevice->bEnable8021x) if (pDevice->bEncryptionEnable || pDevice->bEnable8021x)
...@@ -4386,7 +4386,7 @@ bAdd_PMKID_Candidate( ...@@ -4386,7 +4386,7 @@ bAdd_PMKID_Candidate(
PSRSNCapObject psRSNCapObj PSRSNCapObject psRSNCapObj
) )
{ {
PSDevice pDevice = (PSDevice)hDeviceContext; struct vnt_private *pDevice = hDeviceContext;
struct pmkid_candidate *pCandidateList; struct pmkid_candidate *pCandidateList;
unsigned int ii = 0; unsigned int ii = 0;
...@@ -4443,7 +4443,7 @@ vFlush_PMKID_Candidate( ...@@ -4443,7 +4443,7 @@ vFlush_PMKID_Candidate(
void *hDeviceContext void *hDeviceContext
) )
{ {
PSDevice pDevice = (PSDevice)hDeviceContext; struct vnt_private *pDevice = hDeviceContext;
if (pDevice == NULL) if (pDevice == NULL)
return; return;
......
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