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

Commit 22040bbf authored by Andres More's avatar Andres More Committed by Greg Kroah-Hartman
Browse files

staging: vt6656: simplified tests involving both multi/broad-casts 



By definition the broadcast address is also a multicast address.
Lindented the modified section as required by checkpatch.pl.

Signed-off-by: default avatarAndres More <more.andres@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 7b6a0013

drivers/staging/vt6656/rxtx.c

+13 −18
Original line number Diff line number Diff line
@@ -1487,12 +1487,11 @@ s_bPacketToWirelessUsb( 
    } else { //if (pDevice->dwDiagRefCount != 0) {

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

	    (pDevice->eOPMode == OP_MODE_AP)) {

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

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

		if (is_multicast_ether_addr(psEthHeader->abyDstAddr)) {

			bNeedACK = FALSE;

                pTxBufHead->wFIFOCtl = pTxBufHead->wFIFOCtl & (~FIFOCTL_NEEDACK);

            }

            else {

			pTxBufHead->wFIFOCtl =

				pTxBufHead->wFIFOCtl & (~FIFOCTL_NEEDACK);

		} else {

			bNeedACK = TRUE;

			pTxBufHead->wFIFOCtl |= FIFOCTL_NEEDACK;

		}
@@ -2030,9 +2029,7 @@ CMD_STATUS csMgmt_xmit( 
    pTxBufHead->wFIFOCtl |= FIFOCTL_TMOEN;

    pTxBufHead->wTimeStamp = cpu_to_le16(DEFAULT_MGN_LIFETIME_RES_64us);





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

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

    if (is_multicast_ether_addr(pPacket->p80211Header->sA3.abyAddr1)) {

        bNeedACK = FALSE;

    }

    else {
@@ -2439,9 +2436,7 @@ vDMA0_tx_80211(PSDevice pDevice, struct sk_buff *skb) { 
    pTxBufHead->wFIFOCtl |= FIFOCTL_TMOEN;

    pTxBufHead->wTimeStamp = cpu_to_le16(DEFAULT_MGN_LIFETIME_RES_64us);





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

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

    if (is_multicast_ether_addr(p80211Header->sA3.abyAddr1)) {

        bNeedACK = FALSE;

        if (pDevice->bEnableHostWEP) {

            uNodeIndex = 0;
@@ -2965,7 +2960,7 @@ nsDMA_tx_packet( 
    else {

        if (pDevice->eOPMode == OP_MODE_ADHOC) {

            // Adhoc Tx rate decided from node DB

	    if (is_multicast_ether_addr(&(pDevice->sTxEthHeader.abyDstAddr[0]))) {

	    if (is_multicast_ether_addr(pDevice->sTxEthHeader.abyDstAddr)) {

                // Multicast use highest data rate

                pDevice->wCurrentRate = pMgmt->sNodeDBTable[0].wTxDataRate;

                // preamble type