Commit fe4f34bd authored by Charles Clément's avatar Charles Clément Committed by Greg Kroah-Hartman
Browse files

Staging: vt6655: remove PUINT typedef 



Signed-off-by: default avatarCharles Clément <caratorn@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 3fc9b584

drivers/staging/vt6655/bssdb.c

+3 −9
Original line number Diff line number Diff line
@@ -762,11 +762,8 @@ BSSbUpdateToBSSList ( 
-*/



BOOL

BSSDBbIsSTAInNodeDB(

    void *pMgmtObject,

    unsigned char *abyDstAddr,

    PUINT puNodeIndex

    )

BSSDBbIsSTAInNodeDB(void *pMgmtObject, unsigned char *abyDstAddr,

		unsigned int *puNodeIndex)

{

    PSMgmtObject    pMgmt = (PSMgmtObject) pMgmtObject;

    unsigned int ii;
@@ -797,10 +794,7 @@ BSSDBbIsSTAInNodeDB( 
 *

-*/

void

BSSvCreateOneNode(

    void *hDeviceContext,

    PUINT puNodeIndex

    )

BSSvCreateOneNode(void *hDeviceContext, unsigned int *puNodeIndex)

{



    PSDevice     pDevice = (PSDevice)hDeviceContext;

drivers/staging/vt6655/bssdb.h

+3 −9
Original line number Diff line number Diff line
@@ -309,17 +309,11 @@ BSSbUpdateToBSSList( 




BOOL

BSSDBbIsSTAInNodeDB(

    void *hDeviceContext,

    unsigned char *abyDstAddr,

    PUINT puNodeIndex

    );

BSSDBbIsSTAInNodeDB(void *hDeviceContext, unsigned char *abyDstAddr,

		unsigned int *puNodeIndex);



void

BSSvCreateOneNode(

    void *hDeviceContext,

    PUINT puNodeIndex

    );

BSSvCreateOneNode(void *hDeviceContext, unsigned int *puNodeIndex);



void

BSSvUpdateAPNode(

drivers/staging/vt6655/dpc.c

+14 −34
Original line number Diff line number Diff line
@@ -79,24 +79,14 @@ const unsigned char acbyRxRate[MAX_RATE] = 
static unsigned char s_byGetRateIdx(unsigned char byRate);





static

void

s_vGetDASA(

    unsigned char *pbyRxBufferAddr,

    PUINT pcbHeaderSize,

    PSEthernetHeader psEthHeader

    );

static void

s_vGetDASA(unsigned char *pbyRxBufferAddr, unsigned int *pcbHeaderSize,

		PSEthernetHeader psEthHeader);



static

void

s_vProcessRxMACHeader (

    PSDevice pDevice,

    unsigned char *pbyRxBufferAddr,

    unsigned int cbPacketSize,

    BOOL bIsWEP,

    BOOL bExtIV,

    PUINT pcbHeadSize

    );

static void

s_vProcessRxMACHeader(PSDevice pDevice, unsigned char *pbyRxBufferAddr,

		unsigned int cbPacketSize, BOOL bIsWEP, BOOL bExtIV,

		unsigned int *pcbHeadSize);



static BOOL s_bAPModeRxCtl(

    PSDevice pDevice,
@@ -162,16 +152,10 @@ static BOOL s_bHostWepRxEncryption( 
 * Return Value: None

 *

-*/

static

void

s_vProcessRxMACHeader (

    PSDevice pDevice,

    unsigned char *pbyRxBufferAddr,

    unsigned int cbPacketSize,

    BOOL bIsWEP,

    BOOL bExtIV,

    PUINT pcbHeadSize

    )

static void

s_vProcessRxMACHeader(PSDevice pDevice, unsigned char *pbyRxBufferAddr,

		unsigned int cbPacketSize, BOOL bIsWEP, BOOL bExtIV,

		unsigned int *pcbHeadSize)

{

    unsigned char *pbyRxBuffer;

    unsigned int cbHeaderSize = 0;
@@ -261,13 +245,9 @@ static unsigned char s_byGetRateIdx (unsigned char byRate) 
}





static

void

s_vGetDASA (

    unsigned char *pbyRxBufferAddr,

    PUINT pcbHeaderSize,

    PSEthernetHeader psEthHeader

    )

static void

s_vGetDASA(unsigned char *pbyRxBufferAddr, unsigned int *pcbHeaderSize,

	PSEthernetHeader psEthHeader)

{

    unsigned int cbHeaderSize = 0;

    PS802_11Header  pMACHeader;

drivers/staging/vt6655/rxtx.c

+15 −47
Original line number Diff line number Diff line
@@ -170,22 +170,11 @@ static void s_vFillFragParameter( 
    );





static

unsigned int

s_cbFillTxBufHead (

    PSDevice         pDevice,

    unsigned char byPktType,

    unsigned char *pbyTxBufferAddr,

    unsigned int	cbFrameBodySize,

    unsigned int	uDMAIdx,

    PSTxDesc         pHeadTD,

    PSEthernetHeader psEthHeader,

    unsigned char *pPacket,

    BOOL             bNeedEncrypt,

    PSKeyItem        pTransmitKey,

    unsigned int	uNodeIndex,

    PUINT            puMACfragNum

    );

static unsigned int

s_cbFillTxBufHead(PSDevice pDevice, unsigned char byPktType, unsigned char *pbyTxBufferAddr,

	unsigned int cbFrameBodySize, unsigned int uDMAIdx, PSTxDesc pHeadTD,

	PSEthernetHeader psEthHeader, unsigned char *pPacket, BOOL bNeedEncrypt,

	PSKeyItem pTransmitKey, unsigned int uNodeIndex, unsigned int *puMACfragNum);





static
@@ -1315,22 +1304,11 @@ s_vFillFragParameter( 
    //DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"s_vFillFragParameter END\n");

}



static

unsigned int

s_cbFillTxBufHead (

    PSDevice         pDevice,

    unsigned char byPktType,

    unsigned char *pbyTxBufferAddr,

    unsigned int cbFrameBodySize,

    unsigned int uDMAIdx,

    PSTxDesc         pHeadTD,

    PSEthernetHeader psEthHeader,

    unsigned char *pPacket,

    BOOL             bNeedEncrypt,

    PSKeyItem        pTransmitKey,

    unsigned int uNodeIndex,

    PUINT            puMACfragNum

    )

static unsigned int

s_cbFillTxBufHead(PSDevice pDevice, unsigned char byPktType, unsigned char *pbyTxBufferAddr,

	unsigned int cbFrameBodySize, unsigned int uDMAIdx, PSTxDesc pHeadTD,

	PSEthernetHeader psEthHeader, unsigned char *pPacket, BOOL bNeedEncrypt,

	PSKeyItem pTransmitKey, unsigned int uNodeIndex, unsigned int *puMACfragNum)

{

    unsigned int cbMACHdLen;

    unsigned int cbFrameSize;
@@ -2094,21 +2072,11 @@ s_cbFillTxBufHead ( 




void

vGenerateFIFOHeader (

    PSDevice         pDevice,

    unsigned char byPktType,

    unsigned char *pbyTxBufferAddr,

    BOOL             bNeedEncrypt,

    unsigned int cbPayloadSize,

    unsigned int uDMAIdx,

    PSTxDesc         pHeadTD,

    PSEthernetHeader psEthHeader,

    unsigned char *pPacket,

    PSKeyItem        pTransmitKey,

    unsigned int uNodeIndex,

    PUINT            puMACfragNum,

    PUINT            pcbHeaderSize

    )

vGenerateFIFOHeader(PSDevice pDevice, unsigned char byPktType, unsigned char *pbyTxBufferAddr,

	BOOL bNeedEncrypt, unsigned int cbPayloadSize, unsigned int uDMAIdx,

	PSTxDesc pHeadTD, PSEthernetHeader psEthHeader, unsigned char *pPacket,

	PSKeyItem pTransmitKey, unsigned int uNodeIndex, unsigned int *puMACfragNum,

	unsigned int *pcbHeaderSize)

{

    unsigned int wTxBufSize;       // FFinfo size

    BOOL            bNeedACK;

drivers/staging/vt6655/rxtx.h

+12 −32
Original line number Diff line number Diff line
@@ -40,23 +40,14 @@ 
/*---------------------  Export Functions  --------------------------*/



/*

void vGenerateMACHeader(

    PSDevice pDevice,

    unsigned long dwTxBufferAddr,

    unsigned char *pbySkbData,

    unsigned int cbPacketSize,

    BOOL bDMA0Used,

    PUINT pcbHeadSize,

    PUINT pcbAppendPayload

     );

void

vGenerateMACHeader(PSDevice pDevice, unsigned long dwTxBufferAddr, unsigned char *pbySkbData,

	unsigned int cbPacketSize, BOOL bDMA0Used, unsigned int *pcbHeadSize,

	unsigned int *pcbAppendPayload);



void vProcessRxMACHeader (

    PSDevice pDevice,

    unsigned long dwRxBufferAddr,

    unsigned int cbPacketSize,

    BOOL bIsWEP,

    PUINT pcbHeadSize

    );

void

vProcessRxMACHeader(PSDevice pDevice, unsigned long dwRxBufferAddr, unsigned int cbPacketSize,

	BOOL bIsWEP, unsigned int *pcbHeadSize);

*/
@@ -83,21 +74,10 @@ cbGetFragCount( 




void

vGenerateFIFOHeader (

    PSDevice         pDevice,

    unsigned char byPktTyp,

    unsigned char *pbyTxBufferAddr,

    BOOL             bNeedEncrypt,

    unsigned int	cbPayloadSize,

    unsigned int	uDMAIdx,

    PSTxDesc         pHeadTD,

    PSEthernetHeader psEthHeader,

    unsigned char *pPacket,

    PSKeyItem        pTransmitKey,

    unsigned int	uNodeIndex,

    PUINT            puMACfragNum,

    PUINT            pcbHeaderSize

    );

vGenerateFIFOHeader(PSDevice pDevice, unsigned char byPktTyp, unsigned char *pbyTxBufferAddr,

	BOOL bNeedEncrypt, unsigned int	cbPayloadSize, unsigned int uDMAIdx, PSTxDesc pHeadTD,

	PSEthernetHeader psEthHeader, unsigned char *pPacket, PSKeyItem pTransmitKey,

	unsigned int uNodeIndex, unsigned int *puMACfragNum, unsigned int *pcbHeaderSize);





void vDMA0_tx_80211(PSDevice  pDevice, struct sk_buff *skb, unsigned char *pbMPDU, unsigned int cbMPDULen);