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

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

Staging: vt6655: use is_multicast_ether_addr instead of custom macro 



Replace custom macro IS_MULTICAST_ADDRESS by is_multicast_ether_addr
from <linux/etherdevice.h>.
Remove linux/if_ether.h include as it is included in
linux/etherdevice.h already.

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

drivers/staging/vt6655/device_main.c

+1 −1
Original line number Diff line number Diff line
@@ -2307,7 +2307,7 @@ static int device_xmit(struct sk_buff *skb, struct net_device *dev) { 
            spin_unlock_irq(&pDevice->lock);

            return 0;

        }

        if (IS_MULTICAST_ADDRESS((PBYTE)(skb->data))) {

        if (is_multicast_ether_addr((PBYTE)(skb->data))) {

            uNodeIndex = 0;

            bNodeExist = TRUE;

            if (pMgmt->sNodeDBTable[0].bPSEnable) {

drivers/staging/vt6655/dpc.c

+2 −2
Original line number Diff line number Diff line
@@ -463,7 +463,7 @@ device_receive_frame ( 
        return FALSE;

    }



    if (!IS_MULTICAST_ADDRESS(pbyFrame) && !IS_BROADCAST_ADDRESS(pbyFrame)) {

    if (!is_multicast_ether_addr(pbyFrame) && !IS_BROADCAST_ADDRESS(pbyFrame)) {

        if (WCTLbIsDuplicate(&(pDevice->sDupRxCache), (PS802_11Header) (skb->data + 4))) {

            pDevice->s802_11Counter.FrameDuplicateCount++;

            return FALSE;
@@ -1460,7 +1460,7 @@ static BOOL s_bAPModeRxData ( 
    if (FrameSize > CB_MAX_BUF_SIZE)

        return FALSE;

    // check DA

    if(IS_MULTICAST_ADDRESS((PBYTE)(skb->data+cbHeaderOffset))) {

    if(is_multicast_ether_addr((PBYTE)(skb->data+cbHeaderOffset))) {

       if (pMgmt->sNodeDBTable[0].bPSEnable) {



           skbcpy = dev_alloc_skb((int)pDevice->rx_buf_sz);

drivers/staging/vt6655/mib.c

+2 −2
Original line number Diff line number Diff line
@@ -475,7 +475,7 @@ STAvUpdateTDStatCounter ( 
            pStatistic->ullTxBroadcastFrames[uIdx]++;

            pStatistic->ullTxBroadcastBytes[uIdx] += (ULONGLONG)cbFrameLength;

        }

        else if (IS_MULTICAST_ADDRESS(pbyDestAddr)) {

        else if (is_multicast_ether_addr(pbyDestAddr)) {

            pStatistic->ullTxMulticastFrames[uIdx]++;

            pStatistic->ullTxMulticastBytes[uIdx] += (ULONGLONG)cbFrameLength;

        }
@@ -497,7 +497,7 @@ STAvUpdateTDStatCounter ( 


    if (IS_BROADCAST_ADDRESS(pbyDestAddr))

        pStatistic->dwTsrBroadcast[uIdx]++;

    else if (IS_MULTICAST_ADDRESS(pbyDestAddr))

    else if (is_multicast_ether_addr(pbyDestAddr))

        pStatistic->dwTsrMulticast[uIdx]++;

    else

        pStatistic->dwTsrDirected[uIdx]++;

drivers/staging/vt6655/rxtx.c

+5 −5
Original line number Diff line number Diff line
@@ -1394,7 +1394,7 @@ s_cbFillTxBufHead ( 
    if ((pDevice->eOPMode == OP_MODE_ADHOC) ||

        (pDevice->eOPMode == OP_MODE_AP)) {



        if (IS_MULTICAST_ADDRESS(&(psEthHeader->abyDstAddr[0])) ||

        if (is_multicast_ether_addr(&(psEthHeader->abyDstAddr[0])) ||

            IS_BROADCAST_ADDRESS(&(psEthHeader->abyDstAddr[0]))) {

            bNeedACK = FALSE;

        }
@@ -2123,7 +2123,7 @@ vGenerateFIFOHeader ( 


    if ((pDevice->eOPMode == OP_MODE_ADHOC) ||

        (pDevice->eOPMode == OP_MODE_AP)) {

        if (IS_MULTICAST_ADDRESS(&(psEthHeader->abyDstAddr[0])) ||

        if (is_multicast_ether_addr(&(psEthHeader->abyDstAddr[0])) ||

            IS_BROADCAST_ADDRESS(&(psEthHeader->abyDstAddr[0]))) {

            bNeedACK = FALSE;

            pTxBufHead->wFIFOCtl = pTxBufHead->wFIFOCtl & (~FIFOCTL_NEEDACK);
@@ -2424,7 +2424,7 @@ CMD_STATUS csMgmt_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket) { 
    pTxBufHead->wTimeStamp = cpu_to_le16(DEFAULT_MGN_LIFETIME_RES_64us);





    if (IS_MULTICAST_ADDRESS(&(pPacket->p80211Header->sA3.abyAddr1[0])) ||

    if (is_multicast_ether_addr(&(pPacket->p80211Header->sA3.abyAddr1[0])) ||

        IS_BROADCAST_ADDRESS(&(pPacket->p80211Header->sA3.abyAddr1[0]))) {

        bNeedACK = FALSE;

    }
@@ -2760,7 +2760,7 @@ cbGetFragCount ( 


    if ((pDevice->eOPMode == OP_MODE_ADHOC) ||

        (pDevice->eOPMode == OP_MODE_AP)) {

        if (IS_MULTICAST_ADDRESS(&(psEthHeader->abyDstAddr[0])) ||

        if (is_multicast_ether_addr(&(psEthHeader->abyDstAddr[0])) ||

            IS_BROADCAST_ADDRESS(&(psEthHeader->abyDstAddr[0]))) {

            bNeedACK = FALSE;

        }
@@ -2938,7 +2938,7 @@ vDMA0_tx_80211(PSDevice pDevice, struct sk_buff *skb, PBYTE pbMPDU, UINT cbMPDU 
    pTxBufHead->wTimeStamp = cpu_to_le16(DEFAULT_MGN_LIFETIME_RES_64us);





    if (IS_MULTICAST_ADDRESS(&(p80211Header->sA3.abyAddr1[0])) ||

    if (is_multicast_ether_addr(&(p80211Header->sA3.abyAddr1[0])) ||

        IS_BROADCAST_ADDRESS(&(p80211Header->sA3.abyAddr1[0]))) {

        bNeedACK = FALSE;

        if (pDevice->bEnableHostWEP) {

drivers/staging/vt6655/tether.h

+1 −4
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
#ifndef __TETHER_H__

#define __TETHER_H__



#include <linux/if_ether.h>

#include <linux/etherdevice.h>

#include "ttype.h"



/*---------------------  Export Definitions -------------------------*/
@@ -188,9 +188,6 @@ S802_11Header, *PS802_11Header; 
/*---------------------  Export Macros ------------------------------*/

// Frame type macro



#define IS_MULTICAST_ADDRESS(pbyEtherAddr)          \

    ((*(PBYTE)(pbyEtherAddr) & 0x01) == 1)



#define IS_BROADCAST_ADDRESS(pbyEtherAddr) (        \

    (*(PDWORD)(pbyEtherAddr) == 0xFFFFFFFFL) &&     \

    (*(PWORD)((PBYTE)(pbyEtherAddr) + 4) == 0xFFFF) \