Commit cf76dc4b authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman
Browse files

staging: vt6655: bssdb/datarate/dpc/power/rxtx 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 0ffc5874

drivers/staging/vt6655/bssdb.c

+16 −16
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ BSSpSearchBSSList( 
	CARD_PHY_TYPE  ePhyType

)

{

	PSDevice        pDevice = (PSDevice)hDeviceContext;

	struct vnt_private *pDevice = hDeviceContext;

	PSMgmtObject    pMgmt = pDevice->pMgmt;

	unsigned char *pbyBSSID = NULL;

	PWLAN_IE_SSID   pSSID = NULL;
@@ -240,7 +240,7 @@ BSSvClearBSSList( 
	bool bKeepCurrBSSID

)

{

	PSDevice     pDevice = (PSDevice)hDeviceContext;

	struct vnt_private *pDevice = hDeviceContext;

	PSMgmtObject    pMgmt = pDevice->pMgmt;

	unsigned int ii;
@@ -280,7 +280,7 @@ BSSpAddrIsInBSSList( 
	PWLAN_IE_SSID pSSID

)

{

	PSDevice     pDevice = (PSDevice)hDeviceContext;

	struct vnt_private *pDevice = hDeviceContext;

	PSMgmtObject    pMgmt = pDevice->pMgmt;

	PKnownBSS       pBSSList = NULL;

	unsigned int ii;
@@ -333,7 +333,7 @@ BSSbInsertToBSSList( 
	void *pRxPacketContext

)

{

	PSDevice     pDevice = (PSDevice)hDeviceContext;

	struct vnt_private *pDevice = hDeviceContext;

	PSMgmtObject    pMgmt = pDevice->pMgmt;

	PSRxMgmtPacket  pRxPacket = (PSRxMgmtPacket)pRxPacketContext;

	PKnownBSS       pBSSList = NULL;
@@ -540,7 +540,7 @@ BSSbUpdateToBSSList( 
)

{

	int             ii;

	PSDevice        pDevice = (PSDevice)hDeviceContext;

	struct vnt_private *pDevice = hDeviceContext;

	PSMgmtObject    pMgmt = pDevice->pMgmt;

	PSRxMgmtPacket  pRxPacket = (PSRxMgmtPacket)pRxPacketContext;

	long            ldBm;
@@ -715,7 +715,7 @@ BSSDBbIsSTAInNodeDB(void *pMgmtObject, unsigned char *abyDstAddr, 
void

BSSvCreateOneNode(void *hDeviceContext, unsigned int *puNodeIndex)

{

	PSDevice     pDevice = (PSDevice)hDeviceContext;

	struct vnt_private *pDevice = hDeviceContext;

	PSMgmtObject    pMgmt = pDevice->pMgmt;

	unsigned int ii;

	unsigned int BigestCount = 0;
@@ -777,7 +777,7 @@ BSSvRemoveOneNode( 
	unsigned int uNodeIndex

)

{

	PSDevice        pDevice = (PSDevice)hDeviceContext;

	struct vnt_private *pDevice = hDeviceContext;

	PSMgmtObject    pMgmt = pDevice->pMgmt;

	unsigned char byMask[8] = {1, 2, 4, 8, 0x10, 0x20, 0x40, 0x80};

	struct sk_buff  *skb;
@@ -810,7 +810,7 @@ BSSvUpdateAPNode( 
	PWLAN_IE_SUPP_RATES pExtSuppRates

)

{

	PSDevice     pDevice = (PSDevice)hDeviceContext;

	struct vnt_private *pDevice = hDeviceContext;

	PSMgmtObject    pMgmt = pDevice->pMgmt;

	unsigned int uRateLen = WLAN_RATES_MAXLEN;
@@ -861,7 +861,7 @@ BSSvAddMulticastNode( 
	void *hDeviceContext

)

{

	PSDevice     pDevice = (PSDevice)hDeviceContext;

	struct vnt_private *pDevice = hDeviceContext;

	PSMgmtObject    pMgmt = pDevice->pMgmt;



	if (!pDevice->bEnableHostWEP)
@@ -904,7 +904,7 @@ BSSvSecondCallBack( 
	void *hDeviceContext

)

{

	PSDevice        pDevice = (PSDevice)hDeviceContext;

	struct vnt_private *pDevice = hDeviceContext;

	PSMgmtObject    pMgmt = pDevice->pMgmt;

	unsigned int ii;

	PWLAN_IE_SSID   pItemSSID, pCurrSSID;
@@ -1207,7 +1207,7 @@ BSSvUpdateNodeTxCounter( 
	unsigned int uFIFOHeaderSize

)

{

	PSDevice        pDevice = (PSDevice)hDeviceContext;

	struct vnt_private *pDevice = hDeviceContext;

	PSMgmtObject    pMgmt = pDevice->pMgmt;

	unsigned int uNodeIndex = 0;

	unsigned char byTxRetry = (byTsr0 & TSR0_NCR);
@@ -1360,7 +1360,7 @@ BSSvClearNodeDBTable( 
)



{

	PSDevice     pDevice = (PSDevice)hDeviceContext;

	struct vnt_private *pDevice = hDeviceContext;

	PSMgmtObject    pMgmt = pDevice->pMgmt;

	struct sk_buff  *skb;

	unsigned int ii;
@@ -1385,7 +1385,7 @@ void s_vCheckSensitivity( 
	void *hDeviceContext

)

{

	PSDevice        pDevice = (PSDevice)hDeviceContext;

	struct vnt_private *pDevice = hDeviceContext;

	PKnownBSS       pBSSList = NULL;

	PSMgmtObject    pMgmt = pDevice->pMgmt;

	int             ii;
@@ -1435,7 +1435,7 @@ BSSvClearAnyBSSJoinRecord( 
	void *hDeviceContext

)

{

	PSDevice        pDevice = (PSDevice)hDeviceContext;

	struct vnt_private *pDevice = hDeviceContext;

	PSMgmtObject    pMgmt = pDevice->pMgmt;

	unsigned int ii;
@@ -1448,7 +1448,7 @@ void s_uCalculateLinkQual( 
	void *hDeviceContext

)

{

	PSDevice        pDevice = (PSDevice)hDeviceContext;

	struct vnt_private *pDevice = hDeviceContext;

	unsigned long TxOkRatio, TxCnt;

	unsigned long RxOkRatio, RxCnt;

	unsigned long RssiRatio;
@@ -1488,7 +1488,7 @@ void s_vCheckPreEDThreshold( 
	void *hDeviceContext

)

{

	PSDevice        pDevice = (PSDevice)hDeviceContext;

	struct vnt_private *pDevice = hDeviceContext;

	PKnownBSS       pBSSList = NULL;

	PSMgmtObject    pMgmt = &(pDevice->sMgmtObj);

drivers/staging/vt6655/datarate.c

+2 −2
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ RATEvParseMaxRate( 
	unsigned char *pbyTopOFDMRate

)

{

	PSDevice  pDevice = (PSDevice) pDeviceHandler;

	struct vnt_private *pDevice = pDeviceHandler;

	unsigned int ii;

	unsigned char byHighSuppRate = 0;

	unsigned char byRate = 0;
@@ -295,7 +295,7 @@ RATEvTxRateFallBack( 
	PKnownNodeDB psNodeDBTable

)

{

	PSDevice        pDevice = (PSDevice) pDeviceHandler;

	struct vnt_private *pDevice = pDeviceHandler;

	unsigned short wIdxDownRate = 0;

	unsigned int ii;

	bool bAutoRate[MAX_RATE]    = {true, true, true, true, false, false, true, true, true, true, true, true};

drivers/staging/vt6655/dpc.c

+12 −11
Original line number Diff line number Diff line
@@ -79,18 +79,18 @@ s_vGetDASA(unsigned char *pbyRxBufferAddr, unsigned int *pcbHeaderSize, 
	   PSEthernetHeader psEthHeader);



static void

s_vProcessRxMACHeader(PSDevice pDevice, unsigned char *pbyRxBufferAddr,

s_vProcessRxMACHeader(struct vnt_private *pDevice, unsigned char *pbyRxBufferAddr,

		      unsigned int cbPacketSize, bool bIsWEP, bool bExtIV,

		      unsigned int *pcbHeadSize);



static bool s_bAPModeRxCtl(

	PSDevice pDevice,

	struct vnt_private *pDevice,

	unsigned char *pbyFrame,

	int      iSANodeIndex

);



static bool s_bAPModeRxData(

	PSDevice pDevice,

	struct vnt_private *pDevice,

	struct sk_buff *skb,

	unsigned int FrameSize,

	unsigned int cbHeaderOffset,
@@ -99,7 +99,7 @@ static bool s_bAPModeRxData( 
);



static bool s_bHandleRxEncryption(

	PSDevice     pDevice,

	struct vnt_private *pDevice,

	unsigned char *pbyFrame,

	unsigned int FrameSize,

	unsigned char *pbyRsr,
@@ -112,7 +112,7 @@ static bool s_bHandleRxEncryption( 


static bool s_bHostWepRxEncryption(



	PSDevice     pDevice,

	struct vnt_private *pDevice,

	unsigned char *pbyFrame,

	unsigned int FrameSize,

	unsigned char *pbyRsr,
@@ -145,7 +145,8 @@ static bool s_bHostWepRxEncryption( 
 *

 -*/

static void

s_vProcessRxMACHeader(PSDevice pDevice, unsigned char *pbyRxBufferAddr,

s_vProcessRxMACHeader(struct vnt_private *pDevice,

		      unsigned char *pbyRxBufferAddr,

		      unsigned int cbPacketSize, bool bIsWEP, bool bExtIV,

		      unsigned int *pcbHeadSize)

{
@@ -270,7 +271,7 @@ s_vGetDASA(unsigned char *pbyRxBufferAddr, unsigned int *pcbHeaderSize, 


bool

device_receive_frame(

	PSDevice pDevice,

	struct vnt_private *pDevice,

	PSRxDesc pCurrRD

)

{
@@ -871,7 +872,7 @@ device_receive_frame( 
}



static bool s_bAPModeRxCtl(

	PSDevice pDevice,

	struct vnt_private *pDevice,

	unsigned char *pbyFrame,

	int      iSANodeIndex

)
@@ -969,7 +970,7 @@ static bool s_bAPModeRxCtl( 
}



static bool s_bHandleRxEncryption(

	PSDevice     pDevice,

	struct vnt_private *pDevice,

	unsigned char *pbyFrame,

	unsigned int FrameSize,

	unsigned char *pbyRsr,
@@ -1106,7 +1107,7 @@ static bool s_bHandleRxEncryption( 
}



static bool s_bHostWepRxEncryption(

	PSDevice     pDevice,

	struct vnt_private *pDevice,

	unsigned char *pbyFrame,

	unsigned int FrameSize,

	unsigned char *pbyRsr,
@@ -1226,7 +1227,7 @@ static bool s_bHostWepRxEncryption( 
}



static bool s_bAPModeRxData(

	PSDevice pDevice,

	struct vnt_private *pDevice,

	struct sk_buff *skb,

	unsigned int FrameSize,

	unsigned int cbHeaderOffset,

drivers/staging/vt6655/dpc.h

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 


bool

device_receive_frame(

	PSDevice pDevice,

	struct vnt_private *,

	PSRxDesc pCurrRD

);

drivers/staging/vt6655/power.c

+6 −6
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ PSvEnablePowerSaving( 
	unsigned short wListenInterval

)

{

	PSDevice        pDevice = (PSDevice)hDeviceContext;

	struct vnt_private *pDevice = hDeviceContext;

	PSMgmtObject    pMgmt = pDevice->pMgmt;

	unsigned short wAID = pMgmt->wCurrAID | BIT14 | BIT15;
@@ -131,7 +131,7 @@ PSvDisablePowerSaving( 
	void *hDeviceContext

)

{

	PSDevice        pDevice = (PSDevice)hDeviceContext;

	struct vnt_private *pDevice = hDeviceContext;



	// disable power saving hw function

	MACbPSWakeup(pDevice->PortOffset);
@@ -167,7 +167,7 @@ PSbConsiderPowerDown( 
	bool bCheckCountToWakeUp

)

{

	PSDevice        pDevice = (PSDevice)hDeviceContext;

	struct vnt_private *pDevice = hDeviceContext;

	PSMgmtObject    pMgmt = pDevice->pMgmt;

	unsigned int uIdx;
@@ -229,7 +229,7 @@ PSvSendPSPOLL( 
	void *hDeviceContext

)

{

	PSDevice            pDevice = (PSDevice)hDeviceContext;

	struct vnt_private *pDevice = hDeviceContext;

	PSMgmtObject        pMgmt = pDevice->pMgmt;

	PSTxMgmtPacket      pTxPacket = NULL;
@@ -266,7 +266,7 @@ PSbSendNullPacket( 
	void *hDeviceContext

)

{

	PSDevice            pDevice = (PSDevice)hDeviceContext;

	struct vnt_private *pDevice = hDeviceContext;

	PSTxMgmtPacket      pTxPacket = NULL;

	PSMgmtObject        pMgmt = pDevice->pMgmt;

	unsigned int uIdx;
@@ -336,7 +336,7 @@ PSbIsNextTBTTWakeUp( 
	void *hDeviceContext

)

{

	PSDevice         pDevice = (PSDevice)hDeviceContext;

	struct vnt_private *pDevice = hDeviceContext;

	PSMgmtObject        pMgmt = pDevice->pMgmt;

	bool bWakeUp = false;