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

Staging: vt6655: remove PDWORD typedef 



Use unsigned long * instead.

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

drivers/staging/vt6655/aes_ccmp.c

+6 −6
Original line number Diff line number Diff line
@@ -112,9 +112,9 @@ BYTE dot3_table[256] = { 


void xor_128(BYTE *a, BYTE *b, BYTE *out)

{

PDWORD dwPtrA = (PDWORD) a;

PDWORD dwPtrB = (PDWORD) b;

PDWORD dwPtrOut =(PDWORD) out;

unsigned long *dwPtrA = (unsigned long *) a;

unsigned long *dwPtrB = (unsigned long *) b;

unsigned long *dwPtrOut =(unsigned long *) out;



    (*dwPtrOut++) = (*dwPtrA++) ^ (*dwPtrB++);

    (*dwPtrOut++) = (*dwPtrA++) ^ (*dwPtrB++);
@@ -125,9 +125,9 @@ PDWORD dwPtrOut =(PDWORD) out; 


void xor_32(BYTE *a, BYTE *b, BYTE *out)

{

PDWORD dwPtrA = (PDWORD) a;

PDWORD dwPtrB = (PDWORD) b;

PDWORD dwPtrOut =(PDWORD) out;

unsigned long *dwPtrA = (unsigned long *) a;

unsigned long *dwPtrB = (unsigned long *) b;

unsigned long *dwPtrOut =(unsigned long *) out;



    (*dwPtrOut++) = (*dwPtrA++) ^ (*dwPtrB++);

}

drivers/staging/vt6655/dpc.c

+18 −18
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ static BOOL s_bHandleRxEncryption( 
    PSKeyItem   *pKeyOut,

    int *       pbExtIV,

    unsigned short *pwRxTSC15_0,

    PDWORD      pdwRxTSC47_16

    unsigned long *pdwRxTSC47_16

    );



static BOOL s_bHostWepRxEncryption(
@@ -139,7 +139,7 @@ static BOOL s_bHostWepRxEncryption( 
    unsigned char *pbyNewRsr,

    int *       pbExtIV,

    unsigned short *pwRxTSC15_0,

    PDWORD      pdwRxTSC47_16

    unsigned long *pdwRxTSC47_16



    );
@@ -800,8 +800,8 @@ device_receive_frame ( 
    // Soft MIC

    if ((pKey != NULL) && (pKey->byCipherSuite == KEY_CTL_TKIP)) {

        if (bIsWEP) {

            PDWORD          pdwMIC_L;

            PDWORD          pdwMIC_R;

            unsigned long *pdwMIC_L;

            unsigned long *pdwMIC_R;

            DWORD           dwMIC_Priority;

            DWORD           dwMICKey0 = 0, dwMICKey1 = 0;

            DWORD           dwLocalMIC_L = 0;
@@ -810,19 +810,19 @@ device_receive_frame ( 




            if (pMgmt->eCurrMode == WMAC_MODE_ESS_AP) {

                dwMICKey0 = cpu_to_le32(*(PDWORD)(&pKey->abyKey[24]));

                dwMICKey1 = cpu_to_le32(*(PDWORD)(&pKey->abyKey[28]));

                dwMICKey0 = cpu_to_le32(*(unsigned long *)(&pKey->abyKey[24]));

                dwMICKey1 = cpu_to_le32(*(unsigned long *)(&pKey->abyKey[28]));

            }

            else {

                if (pDevice->pMgmt->eAuthenMode == WMAC_AUTH_WPANONE) {

                    dwMICKey0 = cpu_to_le32(*(PDWORD)(&pKey->abyKey[16]));

                    dwMICKey1 = cpu_to_le32(*(PDWORD)(&pKey->abyKey[20]));

                    dwMICKey0 = cpu_to_le32(*(unsigned long *)(&pKey->abyKey[16]));

                    dwMICKey1 = cpu_to_le32(*(unsigned long *)(&pKey->abyKey[20]));

                } else if ((pKey->dwKeyIndex & BIT28) == 0) {

                    dwMICKey0 = cpu_to_le32(*(PDWORD)(&pKey->abyKey[16]));

                    dwMICKey1 = cpu_to_le32(*(PDWORD)(&pKey->abyKey[20]));

                    dwMICKey0 = cpu_to_le32(*(unsigned long *)(&pKey->abyKey[16]));

                    dwMICKey1 = cpu_to_le32(*(unsigned long *)(&pKey->abyKey[20]));

                } else {

                    dwMICKey0 = cpu_to_le32(*(PDWORD)(&pKey->abyKey[24]));

                    dwMICKey1 = cpu_to_le32(*(PDWORD)(&pKey->abyKey[28]));

                    dwMICKey0 = cpu_to_le32(*(unsigned long *)(&pKey->abyKey[24]));

                    dwMICKey1 = cpu_to_le32(*(unsigned long *)(&pKey->abyKey[28]));

                }

            }
@@ -836,8 +836,8 @@ device_receive_frame ( 
            MIC_vGetMIC(&dwLocalMIC_L, &dwLocalMIC_R);

            MIC_vUnInit();



            pdwMIC_L = (PDWORD)(skb->data + 4 + FrameSize);

            pdwMIC_R = (PDWORD)(skb->data + 4 + FrameSize + 4);

            pdwMIC_L = (unsigned long *)(skb->data + 4 + FrameSize);

            pdwMIC_R = (unsigned long *)(skb->data + 4 + FrameSize + 4);

            //DBG_PRN_GRP12(("RxL: %lx, RxR: %lx\n", *pdwMIC_L, *pdwMIC_R));

            //DBG_PRN_GRP12(("LocalL: %lx, LocalR: %lx\n", dwLocalMIC_L, dwLocalMIC_R));

            //DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"dwMICKey0= %lx,dwMICKey1= %lx \n", dwMICKey0, dwMICKey1);
@@ -1171,7 +1171,7 @@ static BOOL s_bHandleRxEncryption ( 
    PSKeyItem   *pKeyOut,

    int *       pbExtIV,

    unsigned short *pwRxTSC15_0,

    PDWORD      pdwRxTSC47_16

    unsigned long *pdwRxTSC47_16

    )

{

    unsigned int PayloadLen = FrameSize;
@@ -1275,7 +1275,7 @@ static BOOL s_bHandleRxEncryption ( 
        // TKIP/AES



        PayloadLen -= (WLAN_HDR_ADDR3_LEN + 8 + 4); // 24 is 802.11 header, 8 is IV&ExtIV, 4 is crc

        *pdwRxTSC47_16 = cpu_to_le32(*(PDWORD)(pbyIV + 4));

        *pdwRxTSC47_16 = cpu_to_le32(*(unsigned long *)(pbyIV + 4));

        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"ExtIV: %lx\n",*pdwRxTSC47_16);

        if (byDecMode == KEY_CTL_TKIP) {

            *pwRxTSC15_0 = cpu_to_le16(MAKEWORD(*(pbyIV+2), *pbyIV));
@@ -1318,7 +1318,7 @@ static BOOL s_bHostWepRxEncryption ( 
    unsigned char *pbyNewRsr,

    int *       pbExtIV,

    unsigned short *pwRxTSC15_0,

    PDWORD      pdwRxTSC47_16

    unsigned long *pdwRxTSC47_16

    )

{

    unsigned int PayloadLen = FrameSize;
@@ -1385,7 +1385,7 @@ static BOOL s_bHostWepRxEncryption ( 
        // TKIP/AES



        PayloadLen -= (WLAN_HDR_ADDR3_LEN + 8 + 4); // 24 is 802.11 header, 8 is IV&ExtIV, 4 is crc

        *pdwRxTSC47_16 = cpu_to_le32(*(PDWORD)(pbyIV + 4));

        *pdwRxTSC47_16 = cpu_to_le32(*(unsigned long *)(pbyIV + 4));

        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"ExtIV: %lx\n",*pdwRxTSC47_16);



        if (byDecMode == KEY_CTL_TKIP) {

drivers/staging/vt6655/ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -732,7 +732,7 @@ vConfigWEPKey ( 
    pDevice->auWepKeyLength[dwKeyIndex] = uKeyLength;



    MACvSetDefaultKeyEntry(pDevice->PortOffset, uKeyLength, dwKeyIndex,

                           (PDWORD) &(pDevice->abyWepKey[dwKeyIndex][0]), pDevice->byLocalID);

                           (unsigned long *) &(pDevice->abyWepKey[dwKeyIndex][0]), pDevice->byLocalID);



    if (pDevice->eEncryptionStatus < Ndis802_11EncryptionNotSupported) {

        for(ii=0; ii<MAX_GROUP_KEY; ii++) {

drivers/staging/vt6655/key.c

+4 −4
Original line number Diff line number Diff line
@@ -252,7 +252,7 @@ BOOL KeybSetKey ( 
                if (uKeyLength == WLAN_WEP104_KEYLEN)

                    pKey->abyKey[15] |= 0x80;

            }

            MACvSetKeyEntry(dwIoBase, pTable->KeyTable[i].wKeyCtl, i, uKeyIdx, pbyBSSID, (PDWORD)pKey->abyKey, byLocalID);

            MACvSetKeyEntry(dwIoBase, pTable->KeyTable[i].wKeyCtl, i, uKeyIdx, pbyBSSID, (unsigned long *)pKey->abyKey, byLocalID);



            if ((dwKeyIndex & USE_KEYRSC) == 0) {

                // RSC set by NIC
@@ -317,7 +317,7 @@ BOOL KeybSetKey ( 
            if (uKeyLength == WLAN_WEP104_KEYLEN)

                pKey->abyKey[15] |= 0x80;

        }

        MACvSetKeyEntry(dwIoBase, pTable->KeyTable[j].wKeyCtl, j, uKeyIdx, pbyBSSID, (PDWORD)pKey->abyKey, byLocalID);

        MACvSetKeyEntry(dwIoBase, pTable->KeyTable[j].wKeyCtl, j, uKeyIdx, pbyBSSID, (unsigned long *)pKey->abyKey, byLocalID);



        if ((dwKeyIndex & USE_KEYRSC) == 0) {

            // RSC set by NIC
@@ -693,7 +693,7 @@ BOOL KeybSetDefaultKey ( 
        if (uKeyLength == WLAN_WEP104_KEYLEN)

            pKey->abyKey[15] |= 0x80;

    }

    MACvSetKeyEntry(dwIoBase, pTable->KeyTable[MAX_KEY_TABLE-1].wKeyCtl, MAX_KEY_TABLE-1, uKeyIdx, pTable->KeyTable[MAX_KEY_TABLE-1].abyBSSID, (PDWORD)pKey->abyKey, byLocalID);

    MACvSetKeyEntry(dwIoBase, pTable->KeyTable[MAX_KEY_TABLE-1].wKeyCtl, MAX_KEY_TABLE-1, uKeyIdx, pTable->KeyTable[MAX_KEY_TABLE-1].abyBSSID, (unsigned long *)pKey->abyKey, byLocalID);



    if ((dwKeyIndex & USE_KEYRSC) == 0) {

        // RSC set by NIC
@@ -792,7 +792,7 @@ BOOL KeybSetAllGroupKey ( 
                if (uKeyLength == WLAN_WEP104_KEYLEN)

                    pKey->abyKey[15] |= 0x80;

            }

            MACvSetKeyEntry(dwIoBase, pTable->KeyTable[i].wKeyCtl, i, uKeyIdx, pTable->KeyTable[i].abyBSSID, (PDWORD)pKey->abyKey, byLocalID);

            MACvSetKeyEntry(dwIoBase, pTable->KeyTable[i].wKeyCtl, i, uKeyIdx, pTable->KeyTable[i].abyBSSID, (unsigned long *)pKey->abyKey, byLocalID);



            if ((dwKeyIndex & USE_KEYRSC) == 0) {

                // RSC set by NIC

drivers/staging/vt6655/mac.c

+12 −12
Original line number Diff line number Diff line
@@ -703,14 +703,14 @@ void MACvRestoreContext (DWORD_PTR dwIoBase, unsigned char *pbyCxtBuf) 
    }



    // restore CURR_RX_DESC_ADDR, CURR_TX_DESC_ADDR

    VNSvOutPortD(dwIoBase + MAC_REG_TXDMAPTR0, *(PDWORD)(pbyCxtBuf + MAC_REG_TXDMAPTR0));

    VNSvOutPortD(dwIoBase + MAC_REG_AC0DMAPTR, *(PDWORD)(pbyCxtBuf + MAC_REG_AC0DMAPTR));

    VNSvOutPortD(dwIoBase + MAC_REG_BCNDMAPTR, *(PDWORD)(pbyCxtBuf + MAC_REG_BCNDMAPTR));

    VNSvOutPortD(dwIoBase + MAC_REG_TXDMAPTR0, *(unsigned long *)(pbyCxtBuf + MAC_REG_TXDMAPTR0));

    VNSvOutPortD(dwIoBase + MAC_REG_AC0DMAPTR, *(unsigned long *)(pbyCxtBuf + MAC_REG_AC0DMAPTR));

    VNSvOutPortD(dwIoBase + MAC_REG_BCNDMAPTR, *(unsigned long *)(pbyCxtBuf + MAC_REG_BCNDMAPTR));





    VNSvOutPortD(dwIoBase + MAC_REG_RXDMAPTR0, *(PDWORD)(pbyCxtBuf + MAC_REG_RXDMAPTR0));

    VNSvOutPortD(dwIoBase + MAC_REG_RXDMAPTR0, *(unsigned long *)(pbyCxtBuf + MAC_REG_RXDMAPTR0));



    VNSvOutPortD(dwIoBase + MAC_REG_RXDMAPTR1, *(PDWORD)(pbyCxtBuf + MAC_REG_RXDMAPTR1));

    VNSvOutPortD(dwIoBase + MAC_REG_RXDMAPTR1, *(unsigned long *)(pbyCxtBuf + MAC_REG_RXDMAPTR1));



}
@@ -737,22 +737,22 @@ BOOL MACbCompareContext (DWORD_PTR dwIoBase, unsigned char *pbyCxtBuf) 


    // compare CURR_RX_DESC_ADDR, CURR_TX_DESC_ADDR

    VNSvInPortD(dwIoBase + MAC_REG_TXDMAPTR0, &dwData);

    if (dwData != *(PDWORD)(pbyCxtBuf + MAC_REG_TXDMAPTR0)) {

    if (dwData != *(unsigned long *)(pbyCxtBuf + MAC_REG_TXDMAPTR0)) {

        return FALSE;

    }



    VNSvInPortD(dwIoBase + MAC_REG_AC0DMAPTR, &dwData);

    if (dwData != *(PDWORD)(pbyCxtBuf + MAC_REG_AC0DMAPTR)) {

    if (dwData != *(unsigned long *)(pbyCxtBuf + MAC_REG_AC0DMAPTR)) {

        return FALSE;

    }



    VNSvInPortD(dwIoBase + MAC_REG_RXDMAPTR0, &dwData);

    if (dwData != *(PDWORD)(pbyCxtBuf + MAC_REG_RXDMAPTR0)) {

    if (dwData != *(unsigned long *)(pbyCxtBuf + MAC_REG_RXDMAPTR0)) {

        return FALSE;

    }



    VNSvInPortD(dwIoBase + MAC_REG_RXDMAPTR1, &dwData);

    if (dwData != *(PDWORD)(pbyCxtBuf + MAC_REG_RXDMAPTR1)) {

    if (dwData != *(unsigned long *)(pbyCxtBuf + MAC_REG_RXDMAPTR1)) {

        return FALSE;

    }
@@ -1456,7 +1456,7 @@ BOOL MACbPSWakeup (DWORD_PTR dwIoBase) 
 */



void MACvSetKeyEntry (DWORD_PTR dwIoBase, WORD wKeyCtl, unsigned int uEntryIdx,

		unsigned int uKeyIdx, unsigned char *pbyAddr, PDWORD pdwKey, BYTE byLocalID)

		unsigned int uKeyIdx, unsigned char *pbyAddr, unsigned long *pdwKey, BYTE byLocalID)

{

WORD    wOffset;

DWORD   dwData;
@@ -1551,7 +1551,7 @@ WORD wOffset; 
 */



void MACvSetDefaultKeyEntry (DWORD_PTR dwIoBase, unsigned int uKeyLen,

		unsigned int uKeyIdx, PDWORD pdwKey, BYTE byLocalID)

		unsigned int uKeyIdx, unsigned long *pdwKey, BYTE byLocalID)

{

WORD    wOffset;

DWORD   dwData;
@@ -1667,7 +1667,7 @@ DWORD dwData; 
 *

 */

void MACvSetDefaultTKIPKeyEntry (DWORD_PTR dwIoBase, unsigned int uKeyLen,

		unsigned int uKeyIdx, PDWORD pdwKey, BYTE byLocalID)

		unsigned int uKeyIdx, unsigned long *pdwKey, BYTE byLocalID)

{

WORD    wOffset;

DWORD   dwData;