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

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

Staging: vt6655: use compare_ether_addr instead of custom macro 



Replace custom macro IS_ETH_ADDRESS_EQUAL by compare_ether_addr from
<linux/etherdevice.h>.

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

drivers/staging/vt6655/bssdb.c

+4 −4
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ BYTE ZeroBSSID[WLAN_BSSID_LEN]={0x00,0x00,0x00,0x00,0x00,0x00}; 
if(pDevice->bLinkPass==FALSE) pCurrBSS->bSelected = FALSE;

            if ((pCurrBSS->bActive) &&

                (pCurrBSS->bSelected == FALSE)) {

                if (IS_ETH_ADDRESS_EQUAL(pCurrBSS->abyBSSID, pbyBSSID)) {

                if (!compare_ether_addr(pCurrBSS->abyBSSID, pbyBSSID)) {

                    if (pSSID != NULL) {

                        // compare ssid

                        if ( !memcmp(pSSID->abySSID,
@@ -293,7 +293,7 @@ BSSvClearBSSList( 
    for (ii = 0; ii < MAX_BSS_NUM; ii++) {

        if (bKeepCurrBSSID) {

            if (pMgmt->sBSSList[ii].bActive &&

                IS_ETH_ADDRESS_EQUAL(pMgmt->sBSSList[ii].abyBSSID, pMgmt->abyCurrBSSID)) {

                !compare_ether_addr(pMgmt->sBSSList[ii].abyBSSID, pMgmt->abyCurrBSSID)) {

               // bKeepCurrBSSID = FALSE;

                continue;

            }
@@ -338,7 +338,7 @@ BSSpAddrIsInBSSList( 
    for (ii = 0; ii < MAX_BSS_NUM; ii++) {

        pBSSList = &(pMgmt->sBSSList[ii]);

        if (pBSSList->bActive) {

            if (IS_ETH_ADDRESS_EQUAL(pBSSList->abyBSSID, abyBSSID)) {

            if (!compare_ether_addr(pBSSList->abyBSSID, abyBSSID)) {

//                if (pSSID == NULL)

//                    return pBSSList;

                if (pSSID->len == ((PWLAN_IE_SSID)pBSSList->abySSID)->len){
@@ -775,7 +775,7 @@ BSSDBbIsSTAInNodeDB( 
    // Index = 0 reserved for AP Node

    for (ii = 1; ii < (MAX_NODE_NUM + 1); ii++) {

        if (pMgmt->sNodeDBTable[ii].bActive) {

            if (IS_ETH_ADDRESS_EQUAL(abyDstAddr, pMgmt->sNodeDBTable[ii].abyMACAddr)) {

            if (!compare_ether_addr(abyDstAddr, pMgmt->sNodeDBTable[ii].abyMACAddr)) {

                *puNodeIndex = ii;

                return TRUE;

            }

drivers/staging/vt6655/dpc.c

+3 −3
Original line number Diff line number Diff line
@@ -198,10 +198,10 @@ s_vProcessRxMACHeader ( 
    };



    pbyRxBuffer = (PBYTE) (pbyRxBufferAddr + cbHeaderSize);

    if (IS_ETH_ADDRESS_EQUAL(pbyRxBuffer, &pDevice->abySNAP_Bridgetunnel[0])) {

    if (!compare_ether_addr(pbyRxBuffer, &pDevice->abySNAP_Bridgetunnel[0])) {

        cbHeaderSize += 6;

    }

    else if (IS_ETH_ADDRESS_EQUAL(pbyRxBuffer, &pDevice->abySNAP_RFC1042[0])) {

    else if (!compare_ether_addr(pbyRxBuffer, &pDevice->abySNAP_RFC1042[0])) {

        cbHeaderSize += 6;

        pwType = (PWORD) (pbyRxBufferAddr + cbHeaderSize);

        if ((*pwType!= TYPE_PKT_IPX) && (*pwType != cpu_to_le16(0xF380))) {
@@ -475,7 +475,7 @@ device_receive_frame ( 
    s_vGetDASA(skb->data+4, &cbHeaderSize, &pDevice->sRxEthHeader);



    // filter packet send from myself

    if (IS_ETH_ADDRESS_EQUAL((PBYTE)&(pDevice->sRxEthHeader.abySrcAddr[0]), pDevice->abyCurrentNetAddr))

    if (!compare_ether_addr((PBYTE)&(pDevice->sRxEthHeader.abySrcAddr[0]), pDevice->abyCurrentNetAddr))

        return FALSE;



    if ((pMgmt->eCurrMode == WMAC_MODE_ESS_AP) || (pMgmt->eCurrMode == WMAC_MODE_IBSS_STA)) {

drivers/staging/vt6655/iwctl.c

+2 −2
Original line number Diff line number Diff line
@@ -717,7 +717,7 @@ if (pMgmt->eScanState == WMAC_IS_SCANNING) { 
           UINT            ii , uSameBssidNum=0;

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

                     if (pMgmt->sBSSList[ii].bActive &&

                        IS_ETH_ADDRESS_EQUAL(pMgmt->sBSSList[ii].abyBSSID,pMgmt->abyDesireBSSID)) {

                        !compare_ether_addr(pMgmt->sBSSList[ii].abyBSSID, pMgmt->abyDesireBSSID)) {

                        uSameBssidNum++;

                     }

                  }
@@ -906,7 +906,7 @@ if (pMgmt->eScanState == WMAC_IS_SCANNING) { 
                     //         by means of judging if there are two same BSSID exist in list ?

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

                     if (pMgmt->sBSSList[ii].bActive &&

                        IS_ETH_ADDRESS_EQUAL(pMgmt->sBSSList[ii].abyBSSID, pCurr->abyBSSID)) {

                        !compare_ether_addr(pMgmt->sBSSList[ii].abyBSSID, pCurr->abyBSSID)) {

                        uSameBssidNum++;

                     }

                  }

drivers/staging/vt6655/key.c

+5 −5
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ BOOL KeybGetKey ( 
    *pKey = NULL;

    for (i=0;i<MAX_KEY_TABLE;i++) {

        if ((pTable->KeyTable[i].bInUse == TRUE) &&

            IS_ETH_ADDRESS_EQUAL(pTable->KeyTable[i].abyBSSID,pbyBSSID)) {

            !compare_ether_addr(pTable->KeyTable[i].abyBSSID, pbyBSSID)) {

            if (dwKeyIndex == 0xFFFFFFFF) {

                if (pTable->KeyTable[i].PairwiseKey.bKeyValid == TRUE) {

                    *pKey = &(pTable->KeyTable[i].PairwiseKey);
@@ -216,7 +216,7 @@ BOOL KeybSetKey ( 
            j = i;

        }

        if ((pTable->KeyTable[i].bInUse == TRUE) &&

            IS_ETH_ADDRESS_EQUAL(pTable->KeyTable[i].abyBSSID,pbyBSSID)) {

            !compare_ether_addr(pTable->KeyTable[i].abyBSSID, pbyBSSID)) {

            // found table already exist

            if ((dwKeyIndex & PAIRWISE_KEY) != 0) {

                // Pairwise key
@@ -398,7 +398,7 @@ BOOL KeybRemoveKey ( 


    for (i=0;i<MAX_KEY_TABLE;i++) {

        if ((pTable->KeyTable[i].bInUse == TRUE) &&

            IS_ETH_ADDRESS_EQUAL(pTable->KeyTable[i].abyBSSID,pbyBSSID)) {

            !compare_ether_addr(pTable->KeyTable[i].abyBSSID, pbyBSSID)) {

            if ((dwKeyIndex & PAIRWISE_KEY) != 0) {

                pTable->KeyTable[i].PairwiseKey.bKeyValid = FALSE;

                s_vCheckKeyTableValid(pTable, dwIoBase);
@@ -445,7 +445,7 @@ BOOL KeybRemoveAllKey ( 


    for (i=0;i<MAX_KEY_TABLE;i++) {

        if ((pTable->KeyTable[i].bInUse == TRUE) &&

            IS_ETH_ADDRESS_EQUAL(pTable->KeyTable[i].abyBSSID,pbyBSSID)) {

            !compare_ether_addr(pTable->KeyTable[i].abyBSSID, pbyBSSID)) {

            pTable->KeyTable[i].PairwiseKey.bKeyValid = FALSE;

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

                pTable->KeyTable[i].GroupKey[u].bKeyValid = FALSE;
@@ -529,7 +529,7 @@ BOOL KeybGetTransmitKey ( 
    *pKey = NULL;

    for (i=0;i<MAX_KEY_TABLE;i++) {

        if ((pTable->KeyTable[i].bInUse == TRUE) &&

            IS_ETH_ADDRESS_EQUAL(pTable->KeyTable[i].abyBSSID,pbyBSSID)) {

            !compare_ether_addr(pTable->KeyTable[i].abyBSSID, pbyBSSID)) {



            if (dwKeyType == PAIRWISE_KEY) {

drivers/staging/vt6655/tether.h

+0 −7
Original line number Diff line number Diff line
@@ -186,13 +186,6 @@ typedef struct tagS802_11Header { 
S802_11Header, *PS802_11Header;



/*---------------------  Export Macros ------------------------------*/

// Frame type macro



#define IS_ETH_ADDRESS_EQUAL(pbyAddr1, pbyAddr2) (  \

    (*(PDWORD)(pbyAddr1) == *(PDWORD)(pbyAddr2)) && \

    (*(PWORD)((PBYTE)(pbyAddr1) + 4) ==             \

    *(PWORD)((PBYTE)(pbyAddr2) + 4))                \

)



/*---------------------  Export Classes  ----------------------------*/