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

Staging: vt6655: use ETH_ALEN macro instead of custom one 



Replaced custom ethernet address length definition U_ETHER_ADDR_LEN by
ETH_ALEN from <linux/if_ether.h>.

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

drivers/staging/vt6655/aes_ccmp.c

+5 −5
Original line number Diff line number Diff line
@@ -277,7 +277,7 @@ int ii,jj,kk; 
    pbyPayload = pbyIV + 8; //IV-length



    abyNonce[0]  = 0x00; //now is 0, if Qos here will be priority

    memcpy(&(abyNonce[1]), pMACHeader->abyAddr2, U_ETHER_ADDR_LEN);

    memcpy(&(abyNonce[1]), pMACHeader->abyAddr2, ETH_ALEN);

    abyNonce[7]  = pbyIV[7];

    abyNonce[8]  = pbyIV[6];

    abyNonce[9]  = pbyIV[5];
@@ -299,16 +299,16 @@ int ii,jj,kk; 
    byTmp = (BYTE)(pMACHeader->wFrameCtl >> 8);

    byTmp &= 0x87;

    MIC_HDR1[3] = byTmp | 0x40;

    memcpy(&(MIC_HDR1[4]), pMACHeader->abyAddr1, U_ETHER_ADDR_LEN);

    memcpy(&(MIC_HDR1[10]), pMACHeader->abyAddr2, U_ETHER_ADDR_LEN);

    memcpy(&(MIC_HDR1[4]), pMACHeader->abyAddr1, ETH_ALEN);

    memcpy(&(MIC_HDR1[10]), pMACHeader->abyAddr2, ETH_ALEN);



    //MIC_HDR2

    memcpy(&(MIC_HDR2[0]), pMACHeader->abyAddr3, U_ETHER_ADDR_LEN);

    memcpy(&(MIC_HDR2[0]), pMACHeader->abyAddr3, ETH_ALEN);

    byTmp = (BYTE)(pMACHeader->wSeqCtl & 0xff);

    MIC_HDR2[6] = byTmp & 0x0f;

    MIC_HDR2[7] = 0;

    if ( bA4 ) {

        memcpy(&(MIC_HDR2[8]), pMACHeader->abyAddr4, U_ETHER_ADDR_LEN);

        memcpy(&(MIC_HDR2[8]), pMACHeader->abyAddr4, ETH_ALEN);

    } else {

        MIC_HDR2[8]  = 0x00;

        MIC_HDR2[9]  = 0x00;

drivers/staging/vt6655/card.c

+2 −2
Original line number Diff line number Diff line
@@ -1576,7 +1576,7 @@ CARDbAdd_PMKID_Candidate ( 
    // Update Old Candidate

    for (ii = 0; ii < pDevice->gsPMKIDCandidate.NumCandidates; ii++) {

        pCandidateList = &pDevice->gsPMKIDCandidate.CandidateList[ii];

        if ( !memcmp(pCandidateList->BSSID, pbyBSSID, U_ETHER_ADDR_LEN)) {

        if ( !memcmp(pCandidateList->BSSID, pbyBSSID, ETH_ALEN)) {

            if ((bRSNCapExist == TRUE) && (wRSNCap & BIT0)) {

                pCandidateList->Flags |= NDIS_802_11_PMKID_CANDIDATE_PREAUTH_ENABLED;

            } else {
@@ -1593,7 +1593,7 @@ CARDbAdd_PMKID_Candidate ( 
    } else {

        pCandidateList->Flags &= ~(NDIS_802_11_PMKID_CANDIDATE_PREAUTH_ENABLED);

    }

    memcpy(pCandidateList->BSSID, pbyBSSID, U_ETHER_ADDR_LEN);

    memcpy(pCandidateList->BSSID, pbyBSSID, ETH_ALEN);

    pDevice->gsPMKIDCandidate.NumCandidates++;

    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"NumCandidates:%d\n", (int)pDevice->gsPMKIDCandidate.NumCandidates);

    return TRUE;

drivers/staging/vt6655/desc.h

+3 −3
Original line number Diff line number Diff line
@@ -446,8 +446,8 @@ typedef const SRrvTime_atim *PCSRrvTime_atim; 
typedef struct tagSRTSData {

    WORD    wFrameControl;

    WORD    wDurationID;

    BYTE    abyRA[U_ETHER_ADDR_LEN];

    BYTE    abyTA[U_ETHER_ADDR_LEN];

    BYTE    abyRA[ETH_ALEN];

    BYTE    abyTA[ETH_ALEN];

}__attribute__ ((__packed__))

SRTSData, *PSRTSData;

typedef const SRTSData *PCSRTSData;
@@ -522,7 +522,7 @@ typedef const SRTS_a_FB *PCSRTS_a_FB; 
typedef struct tagSCTSData {

    WORD    wFrameControl;

    WORD    wDurationID;

    BYTE    abyRA[U_ETHER_ADDR_LEN];

    BYTE    abyRA[ETH_ALEN];

    WORD    wReserved;

}__attribute__ ((__packed__))

SCTSData, *PSCTSData;

drivers/staging/vt6655/device.h

+9 −9
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ 
#define MAC_MAX_CONTEXT_REG     (256+128)



#define MAX_MULTICAST_ADDRESS_NUM       32

#define MULTICAST_ADDRESS_LIST_SIZE     (MAX_MULTICAST_ADDRESS_NUM * U_ETHER_ADDR_LEN)

#define MULTICAST_ADDRESS_LIST_SIZE     (MAX_MULTICAST_ADDRESS_NUM * ETH_ALEN)





//#define OP_MODE_INFRASTRUCTURE  0
@@ -304,7 +304,7 @@ typedef enum { 
// The receive duplicate detection cache entry

typedef struct tagSCacheEntry{

    WORD        wFmSequence;

    BYTE        abyAddr2[U_ETHER_ADDR_LEN];

    BYTE        abyAddr2[ETH_ALEN];

} SCacheEntry, *PSCacheEntry;



typedef struct tagSCache{
@@ -321,7 +321,7 @@ typedef struct tagSDeFragControlBlock 
{

    WORD            wSequence;

    WORD            wFragNum;

    BYTE            abyAddr2[U_ETHER_ADDR_LEN];

    BYTE            abyAddr2[ETH_ALEN];

	UINT            uLifetime;

    struct sk_buff* skb;

    PBYTE           pbyRxBuffer;
@@ -484,7 +484,7 @@ typedef struct __device_info { 
   BYTE                        byOriginalZonetype;

    BYTE                        abyMacContext[MAC_MAX_CONTEXT_REG];

    BOOL                        bLinkPass;          // link status: OK or fail

    BYTE                        abyCurrentNetAddr[U_ETHER_ADDR_LEN];

    BYTE                        abyCurrentNetAddr[ETH_ALEN];



    // Adapter statistics

    SStatCounter                scStatistic;
@@ -546,8 +546,8 @@ typedef struct __device_info { 
    BYTE                        byOpMode;

    BOOL                        bBSSIDFilter;

    WORD                        wMaxTransmitMSDULifetime;

    BYTE                        abyBSSID[U_ETHER_ADDR_LEN];

    BYTE                        abyDesireBSSID[U_ETHER_ADDR_LEN];

    BYTE                        abyBSSID[ETH_ALEN];

    BYTE                        abyDesireBSSID[ETH_ALEN];

    WORD                        wCTSDuration;       // update while speed change

    WORD                        wACKDuration;       // update while speed change

    WORD                        wRTSTransmitLen;    // update while speed change
@@ -753,9 +753,9 @@ typedef struct __device_info { 


    SEthernetHeader         sTxEthHeader;

    SEthernetHeader         sRxEthHeader;

    BYTE                    abyBroadcastAddr[U_ETHER_ADDR_LEN];

    BYTE                    abySNAP_RFC1042[U_ETHER_ADDR_LEN];

    BYTE                    abySNAP_Bridgetunnel[U_ETHER_ADDR_LEN];

    BYTE                    abyBroadcastAddr[ETH_ALEN];

    BYTE                    abySNAP_RFC1042[ETH_ALEN];

    BYTE                    abySNAP_Bridgetunnel[ETH_ALEN];

     BYTE                        abyEEPROM[EEP_MAX_CONTEXT_SIZE];  //DWORD alignment

    // Pre-Authentication & PMK cache

    SPMKID                  gsPMKID;

drivers/staging/vt6655/device_main.c

+7 −7
Original line number Diff line number Diff line
@@ -429,14 +429,14 @@ pOpts->flags|=DEVICE_FLAGS_DiversityANT; 
static void

device_set_options(PSDevice pDevice) {



    BYTE    abyBroadcastAddr[U_ETHER_ADDR_LEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};

    BYTE    abySNAP_RFC1042[U_ETHER_ADDR_LEN] = {0xAA, 0xAA, 0x03, 0x00, 0x00, 0x00};

    BYTE    abySNAP_Bridgetunnel[U_ETHER_ADDR_LEN] = {0xAA, 0xAA, 0x03, 0x00, 0x00, 0xF8};

    BYTE    abyBroadcastAddr[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};

    BYTE    abySNAP_RFC1042[ETH_ALEN] = {0xAA, 0xAA, 0x03, 0x00, 0x00, 0x00};

    BYTE    abySNAP_Bridgetunnel[ETH_ALEN] = {0xAA, 0xAA, 0x03, 0x00, 0x00, 0xF8};





    memcpy(pDevice->abyBroadcastAddr, abyBroadcastAddr, U_ETHER_ADDR_LEN);

    memcpy(pDevice->abySNAP_RFC1042, abySNAP_RFC1042, U_ETHER_ADDR_LEN);

    memcpy(pDevice->abySNAP_Bridgetunnel, abySNAP_Bridgetunnel, U_ETHER_ADDR_LEN);

    memcpy(pDevice->abyBroadcastAddr, abyBroadcastAddr, ETH_ALEN);

    memcpy(pDevice->abySNAP_RFC1042, abySNAP_RFC1042, ETH_ALEN);

    memcpy(pDevice->abySNAP_Bridgetunnel, abySNAP_Bridgetunnel, ETH_ALEN);



    pDevice->uChannel = pDevice->sOpts.channel_num;

    pDevice->wRTSThreshold = pDevice->sOpts.rts_thresh;
@@ -1971,7 +1971,7 @@ device_init_rd0_ring(pDevice); 
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "call device_init_registers\n");

	device_init_registers(pDevice, DEVICE_INIT_COLD);

    MACvReadEtherAddress(pDevice->PortOffset, pDevice->abyCurrentNetAddr);

    memcpy(pDevice->pMgmt->abyMACAddr, pDevice->abyCurrentNetAddr, U_ETHER_ADDR_LEN);

    memcpy(pDevice->pMgmt->abyMACAddr, pDevice->abyCurrentNetAddr, ETH_ALEN);

    device_set_multi(pDevice->dev);



    // Init for Key Management

CRA Git | Maintained and supported by SUSTech CRA and CCSE