Commit 4b50fb40 authored by Andres More's avatar Andres More Committed by Greg Kroah-Hartman
Browse files

Staging: vt6656: replaced IS_BROADCAST_ADDRESS with is_broadcast_ether_addr 



Replaced and removed the custom definition.
Minor checkpatch warnings on long lines and indentation were not cleared.

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

drivers/staging/vt6656/bssdb.c

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ PKnownBSS BSSpSearchBSSList(void *hDeviceContext, 
        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"BSSpSearchBSSList BSSID[%02X %02X %02X-%02X %02X %02X]\n",

                            *pbyDesireBSSID,*(pbyDesireBSSID+1),*(pbyDesireBSSID+2),

                            *(pbyDesireBSSID+3),*(pbyDesireBSSID+4),*(pbyDesireBSSID+5));

        if ((!IS_BROADCAST_ADDRESS(pbyDesireBSSID)) &&

	if ((!is_broadcast_ether_addr(pbyDesireBSSID)) &&

	     (memcmp(pbyDesireBSSID, ZeroBSSID, 6)!= 0)){

            pbyBSSID = pbyDesireBSSID;

        }

drivers/staging/vt6656/dpc.c

+2 −2
Original line number Diff line number Diff line
@@ -460,7 +460,7 @@ RXbBulkInProcessData ( 
       }

    }



    if (!IS_MULTICAST_ADDRESS(pMACHeader->abyAddr1) && !IS_BROADCAST_ADDRESS(pMACHeader->abyAddr1)) {

    if (!is_multicast_ether_addr(pMACHeader->abyAddr1) && !is_broadcast_ether_addr(pMACHeader->abyAddr1)) {

        if ( WCTLbIsDuplicate(&(pDevice->sDupRxCache), (PS802_11Header) pbyFrame) ) {

            pDevice->s802_11Counter.FrameDuplicateCount++;

            return FALSE;
@@ -1449,7 +1449,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/vt6656/iwctl.c

+1 −1
Original line number Diff line number Diff line
@@ -761,7 +761,7 @@ int iwctl_siwap(struct net_device *dev, 
		memcpy(pMgmt->abyDesireBSSID, wrq->sa_data, 6);



	//mike :add

	 if ((IS_BROADCAST_ADDRESS(pMgmt->abyDesireBSSID)) ||

	 if ((is_broadcast_ether_addr(pMgmt->abyDesireBSSID)) ||

	     (memcmp(pMgmt->abyDesireBSSID, ZeroBSSID, 6) == 0)){

	      PRINT_K("SIOCSIWAP:invalid desired BSSID return!\n");

               return rc;

drivers/staging/vt6656/key.c

+1 −1
Original line number Diff line number Diff line
@@ -402,7 +402,7 @@ BOOL KeybRemoveKey( 
    int     i;

    BOOL    bReturnValue = FALSE;



    if (IS_BROADCAST_ADDRESS(pbyBSSID)) {

    if (is_broadcast_ether_addr(pbyBSSID)) {

        // dealte all key

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

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

drivers/staging/vt6656/rxtx.c

+10 −14
Original line number Diff line number Diff line
@@ -304,10 +304,9 @@ s_vSaveTxPktInfo(PSDevice pDevice, BYTE byPktNum, PBYTE pbyDestAddr, WORD wPktLe 
{

    PSStatCounter           pStatistic=&(pDevice->scStatistic);





    if (IS_BROADCAST_ADDRESS(pbyDestAddr))

    if (is_broadcast_ether_addr(pbyDestAddr))

        pStatistic->abyTxPktInfo[byPktNum].byBroadMultiUni = TX_PKT_BROAD;

    else if (IS_MULTICAST_ADDRESS(pbyDestAddr))

    else if (is_multicast_ether_addr(pbyDestAddr))

        pStatistic->abyTxPktInfo[byPktNum].byBroadMultiUni = TX_PKT_MULTI;

    else

        pStatistic->abyTxPktInfo[byPktNum].byBroadMultiUni = TX_PKT_UNI;
@@ -319,9 +318,6 @@ s_vSaveTxPktInfo(PSDevice pDevice, BYTE byPktNum, PBYTE pbyDestAddr, WORD wPktLe 
	   ETH_ALEN);

}









static

void

s_vFillTxKey (
@@ -1494,8 +1490,8 @@ s_bPacketToWirelessUsb( 
    } else { //if (pDevice->dwDiagRefCount != 0) {

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

            (pDevice->eOPMode == OP_MODE_AP)) {

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

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

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

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

                bNeedACK = FALSE;

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

            }
@@ -2038,8 +2034,8 @@ CMD_STATUS csMgmt_xmit( 
    pTxBufHead->wTimeStamp = cpu_to_le16(DEFAULT_MGN_LIFETIME_RES_64us);





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

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

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

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

        bNeedACK = FALSE;

    }

    else {
@@ -2447,8 +2443,8 @@ vDMA0_tx_80211(PSDevice pDevice, struct sk_buff *skb) { 
    pTxBufHead->wTimeStamp = cpu_to_le16(DEFAULT_MGN_LIFETIME_RES_64us);





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

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

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

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

        bNeedACK = FALSE;

        if (pDevice->bEnableHostWEP) {

            uNodeIndex = 0;
@@ -2783,7 +2779,7 @@ nsDMA_tx_packet( 
            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) {
@@ -2975,7 +2971,7 @@ nsDMA_tx_packet( 
    else {

        if (pDevice->eOPMode == OP_MODE_ADHOC) {

            // Adhoc Tx rate decided from node DB

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

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

                // Multicast use highest data rate

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

                // preamble type