Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Staging: vt6655: remove PBYTE typedef 



Use unsigned char * instead.

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

drivers/staging/vt6655/80211hdr.h

+2 −2
Original line number Diff line number Diff line
@@ -282,8 +282,8 @@ 
#define WLAN_MGMT_GET_TIM_OFFSET(b)     (((b) & ~BIT0) >> 1)



/* 3-Addr & 4-Addr */

#define WLAN_HDR_A3_DATA_PTR(p) (((PBYTE)(p)) + WLAN_HDR_ADDR3_LEN)

#define WLAN_HDR_A4_DATA_PTR(p) (((PBYTE)(p)) + WLAN_HDR_ADDR4_LEN)

#define WLAN_HDR_A3_DATA_PTR(p) (((unsigned char *)(p)) + WLAN_HDR_ADDR3_LEN)

#define WLAN_HDR_A4_DATA_PTR(p) (((unsigned char *)(p)) + WLAN_HDR_ADDR4_LEN)



/* IEEE ADDR */

#define IEEE_ADDR_UNIVERSAL         0x02

drivers/staging/vt6655/80211mgr.c

+18 −16
Original line number Diff line number Diff line
@@ -139,9 +139,9 @@ vMgrDecodeBeacon( 
                                + WLAN_BEACON_OFF_CAPINFO);



    // Information elements

    pItem = (PWLAN_IE)((PBYTE)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)))

    pItem = (PWLAN_IE)((unsigned char *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)))

                       + WLAN_BEACON_OFF_SSID);

    while( ((PBYTE)pItem) < (pFrame->pBuf + pFrame->len) ){

    while( ((unsigned char *)pItem) < (pFrame->pBuf + pFrame->len) ){



        switch (pItem->byElementID) {

            case WLAN_EID_SSID:
@@ -223,7 +223,7 @@ vMgrDecodeBeacon( 
                break;



        }

        pItem = (PWLAN_IE)(((PBYTE)pItem) + 2 + pItem->len);

        pItem = (PWLAN_IE)(((unsigned char *)pItem) + 2 + pItem->len);

    }



    return;
@@ -386,7 +386,7 @@ vMgrDecodeAssocRequest( 
    pItem = (PWLAN_IE)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))

                            + WLAN_ASSOCREQ_OFF_SSID);



    while (((PBYTE)pItem) < (pFrame->pBuf + pFrame->len)) {

    while (((unsigned char *)pItem) < (pFrame->pBuf + pFrame->len)) {

        switch (pItem->byElementID){

            case WLAN_EID_SSID:

                if (pFrame->pSSID == NULL)
@@ -418,7 +418,7 @@ vMgrDecodeAssocRequest( 
                        pItem->byElementID);

                break;

        }

        pItem = (PWLAN_IE)(((PBYTE)pItem) + 2 + pItem->len);

        pItem = (PWLAN_IE)(((unsigned char *)pItem) + 2 + pItem->len);

    }

    return;

}
@@ -488,9 +488,10 @@ vMgrDecodeAssocResponse( 
                           + WLAN_ASSOCRESP_OFF_SUPP_RATES);



    pItem = (PWLAN_IE)(pFrame->pSuppRates);

    pItem = (PWLAN_IE)(((PBYTE)pItem) + 2 + pItem->len);

    pItem = (PWLAN_IE)(((unsigned char *)pItem) + 2 + pItem->len);



    if ((((PBYTE)pItem) < (pFrame->pBuf + pFrame->len)) && (pItem->byElementID == WLAN_EID_EXTSUPP_RATES)) {

    if ((((unsigned char *)pItem) < (pFrame->pBuf + pFrame->len)) &&

		    (pItem->byElementID == WLAN_EID_EXTSUPP_RATES)) {

        pFrame->pExtSuppRates = (PWLAN_IE_SUPP_RATES)pItem;

        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "pFrame->pExtSuppRates=[%p].\n", pItem);

    }
@@ -564,7 +565,7 @@ vMgrDecodeReassocRequest( 
    pItem = (PWLAN_IE)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))

                       + WLAN_REASSOCREQ_OFF_SSID);



    while(((PBYTE)pItem) < (pFrame->pBuf + pFrame->len)) {

    while(((unsigned char *)pItem) < (pFrame->pBuf + pFrame->len)) {



        switch (pItem->byElementID){

            case WLAN_EID_SSID:
@@ -597,7 +598,7 @@ vMgrDecodeReassocRequest( 
                            pItem->byElementID);

                break;

        }

        pItem = (PWLAN_IE)(((PBYTE)pItem) + 2 + pItem->len);

        pItem = (PWLAN_IE)(((unsigned char *)pItem) + 2 + pItem->len);

    }

    return;

}
@@ -649,7 +650,7 @@ vMgrDecodeProbeRequest( 
    // Information elements

    pItem = (PWLAN_IE)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)));



    while( ((PBYTE)pItem) < (pFrame->pBuf + pFrame->len) ) {

    while( ((unsigned char *)pItem) < (pFrame->pBuf + pFrame->len) ) {



        switch (pItem->byElementID) {

            case WLAN_EID_SSID:
@@ -672,7 +673,7 @@ vMgrDecodeProbeRequest( 
                break;

        }



        pItem = (PWLAN_IE)(((PBYTE)pItem) + 2 +  pItem->len);

        pItem = (PWLAN_IE)(((unsigned char *)pItem) + 2 +  pItem->len);

    }

    return;

}
@@ -746,7 +747,7 @@ vMgrDecodeProbeResponse( 
    pItem = (PWLAN_IE)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))

                       + WLAN_PROBERESP_OFF_SSID);



    while( ((PBYTE)pItem) < (pFrame->pBuf + pFrame->len) ) {

    while( ((unsigned char *)pItem) < (pFrame->pBuf + pFrame->len) ) {

        switch (pItem->byElementID) {

            case WLAN_EID_SSID:

                if (pFrame->pSSID == NULL)
@@ -821,7 +822,7 @@ vMgrDecodeProbeResponse( 
                break;

        }



        pItem = (PWLAN_IE)(((PBYTE)pItem) + 2 +  pItem->len);

        pItem = (PWLAN_IE)(((unsigned char *)pItem) + 2 +  pItem->len);

    }

    return;

}
@@ -890,7 +891,7 @@ vMgrDecodeAuthen( 
    pItem = (PWLAN_IE)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))

                       + WLAN_AUTHEN_OFF_CHALLENGE);



    if ((((PBYTE)pItem) < (pFrame->pBuf + pFrame->len)) && (pItem->byElementID == WLAN_EID_CHALLENGE)) {

    if ((((unsigned char *)pItem) < (pFrame->pBuf + pFrame->len)) && (pItem->byElementID == WLAN_EID_CHALLENGE)) {

        pFrame->pChallenge = (PWLAN_IE_CHALLENGE)pItem;

    }
@@ -1017,9 +1018,10 @@ vMgrDecodeReassocResponse( 
                                               + WLAN_REASSOCRESP_OFF_SUPP_RATES);



    pItem = (PWLAN_IE)(pFrame->pSuppRates);

    pItem = (PWLAN_IE)(((PBYTE)pItem) + 2 + pItem->len);

    pItem = (PWLAN_IE)(((unsigned char *)pItem) + 2 + pItem->len);



    if ((((PBYTE)pItem) < (pFrame->pBuf + pFrame->len)) && (pItem->byElementID == WLAN_EID_EXTSUPP_RATES)) {

    if ((((unsigned char *)pItem) < (pFrame->pBuf + pFrame->len)) &&

		    (pItem->byElementID == WLAN_EID_EXTSUPP_RATES)) {

        pFrame->pExtSuppRates = (PWLAN_IE_SUPP_RATES)pItem;

    }

    return;

drivers/staging/vt6655/80211mgr.h

+12 −12
Original line number Diff line number Diff line
@@ -497,7 +497,7 @@ typedef struct tagWLAN_FR_MGMT { 


    unsigned int	uType;

    unsigned int	len;

    PBYTE                 pBuf;

    unsigned char *pBuf;

    PUWLAN_80211HDR       pHdr;



} WLAN_FR_MGMT,  *PWLAN_FR_MGMT;
@@ -507,7 +507,7 @@ typedef struct tagWLAN_FR_BEACON { 


    unsigned int	uType;

    unsigned int	len;

    PBYTE                   pBuf;

    unsigned char *pBuf;

    PUWLAN_80211HDR         pHdr;

    // fixed fields

    PQWORD                  pqwTimestamp;
@@ -539,7 +539,7 @@ typedef struct tagWLAN_FR_IBSSATIM { 


    unsigned int	uType;

    unsigned int	len;

    PBYTE                   pBuf;

    unsigned char *pBuf;

    PUWLAN_80211HDR         pHdr;



    // fixed fields
@@ -553,7 +553,7 @@ typedef struct tagWLAN_FR_DISASSOC { 


    unsigned int	uType;

    unsigned int	len;

    PBYTE                   pBuf;

    unsigned char *pBuf;

    PUWLAN_80211HDR         pHdr;

    /*-- fixed fields -----------*/

    PWORD                   pwReason;
@@ -566,7 +566,7 @@ typedef struct tagWLAN_FR_ASSOCREQ { 


    unsigned int	uType;

    unsigned int	len;

    PBYTE                   pBuf;

    unsigned char *pBuf;

    PUWLAN_80211HDR         pHdr;

    /*-- fixed fields -----------*/

    PWORD                   pwCapInfo;
@@ -587,7 +587,7 @@ typedef struct tagWLAN_FR_ASSOCRESP { 


    unsigned int	uType;

    unsigned int	len;

    PBYTE                   pBuf;

    unsigned char *pBuf;

    PUWLAN_80211HDR         pHdr;

    /*-- fixed fields -----------*/

    PWORD                   pwCapInfo;
@@ -604,7 +604,7 @@ typedef struct tagWLAN_FR_REASSOCREQ { 


    unsigned int	uType;

    unsigned int	len;

    PBYTE                   pBuf;

    unsigned char *pBuf;

    PUWLAN_80211HDR         pHdr;



    /*-- fixed fields -----------*/
@@ -626,7 +626,7 @@ typedef struct tagWLAN_FR_REASSOCRESP { 


    unsigned int	uType;

    unsigned int	len;

    PBYTE                   pBuf;

    unsigned char *pBuf;

    PUWLAN_80211HDR         pHdr;

    /*-- fixed fields -----------*/

    PWORD                   pwCapInfo;
@@ -643,7 +643,7 @@ typedef struct tagWLAN_FR_PROBEREQ { 


    unsigned int	uType;

    unsigned int	len;

    PBYTE                   pBuf;

    unsigned char *pBuf;

    PUWLAN_80211HDR         pHdr;

    /*-- fixed fields -----------*/

    /*-- info elements ----------*/
@@ -658,7 +658,7 @@ typedef struct tagWLAN_FR_PROBERESP { 


    unsigned int	uType;

    unsigned int	len;

    PBYTE                   pBuf;

    unsigned char *pBuf;

    PUWLAN_80211HDR         pHdr;

    /*-- fixed fields -----------*/

    PQWORD                  pqwTimestamp;
@@ -687,7 +687,7 @@ typedef struct tagWLAN_FR_AUTHEN { 


    unsigned int	uType;

    unsigned int	len;

    PBYTE                   pBuf;

    unsigned char *pBuf;

    PUWLAN_80211HDR         pHdr;

    /*-- fixed fields -----------*/

    PWORD                   pwAuthAlgorithm;
@@ -703,7 +703,7 @@ typedef struct tagWLAN_FR_DEAUTHEN { 


    unsigned int	uType;

    unsigned int	len;

    PBYTE                   pBuf;

    unsigned char *pBuf;

    PUWLAN_80211HDR         pHdr;

    /*-- fixed fields -----------*/

    PWORD                   pwReason;

drivers/staging/vt6655/IEEE11h.c

+3 −3
Original line number Diff line number Diff line
@@ -125,9 +125,9 @@ static BOOL s_bRxTPCReq(PSMgmtObject pMgmt, PWLAN_FRAME_TPCREQ pTPCReq, BYTE byR 


    pTxPacket = (PSTxMgmtPacket)pMgmt->pbyMgmtPacketPool;

    memset(pTxPacket, 0, sizeof(STxMgmtPacket) + WLAN_A3FR_MAXLEN);

    pTxPacket->p80211Header = (PUWLAN_80211HDR)((PBYTE)pTxPacket + sizeof(STxMgmtPacket));

    pTxPacket->p80211Header = (PUWLAN_80211HDR)((unsigned char *)pTxPacket + sizeof(STxMgmtPacket));



    pFrame = (PWLAN_FRAME_TPCREP)((PBYTE)pTxPacket + sizeof(STxMgmtPacket));

    pFrame = (PWLAN_FRAME_TPCREP)((unsigned char *)pTxPacket + sizeof(STxMgmtPacket));



    pFrame->Header.wFrameCtl = (   WLAN_SET_FC_FTYPE(WLAN_FTYPE_MGMT) |

                                    WLAN_SET_FC_FSTYPE(WLAN_FSTYPE_ACTION)
@@ -276,7 +276,7 @@ BOOL IEEE11hbMSRRepTx ( 


    pTxPacket = (PSTxMgmtPacket)pMgmt->abyCurrentMSRRep;

    memset(pTxPacket, 0, sizeof(STxMgmtPacket) + WLAN_A3FR_MAXLEN);

    pTxPacket->p80211Header = (PUWLAN_80211HDR)((PBYTE)pTxPacket + sizeof(STxMgmtPacket));

    pTxPacket->p80211Header = (PUWLAN_80211HDR)((unsigned char *)pTxPacket + sizeof(STxMgmtPacket));





    pMSRRep->Header.wFrameCtl = (   WLAN_SET_FC_FTYPE(WLAN_FTYPE_MGMT) |

drivers/staging/vt6655/aes_ccmp.c

+3 −3
Original line number Diff line number Diff line
@@ -243,7 +243,7 @@ BYTE abyRoundKey[16]; 
 * Return Value: MIC compare result

 *

 */

BOOL AESbGenCCMP(PBYTE pbyRxKey, PBYTE pbyFrame, WORD wFrameSize)

BOOL AESbGenCCMP(unsigned char *pbyRxKey, unsigned char *pbyFrame, WORD wFrameSize)

{

BYTE            abyNonce[13];

BYTE            MIC_IV[16];
@@ -256,8 +256,8 @@ BYTE abyPlainText[16]; 
BYTE            abyLastCipher[16];



PS802_11Header  pMACHeader = (PS802_11Header) pbyFrame;

PBYTE           pbyIV;

PBYTE           pbyPayload;

unsigned char *pbyIV;

unsigned char *pbyPayload;

WORD            wHLen = 22;

WORD            wPayloadSize = wFrameSize - 8 - 8 - 4 - WLAN_HDR_ADDR3_LEN;//8 is IV, 8 is MIC, 4 is CRC

BOOL            bA4 = FALSE;