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

Commit 8329419a authored by Joe Perches's avatar Joe Perches Committed by Greg Kroah-Hartman
Browse files

Staging: Convert uses of compare_ether_addr to ether_addr_equal 



Preliminary to removing compare_ether_addr altogether:

Use the new bool function ether_addr_equal to add
some clarity and reduce the likelihood for misuse
of compare_ether_addr for sorting.

Additionally:

Used is_zero_ether_addr, removed now unused variable
Converted uses of &foo[0] to foo

Done via cocci script: (and a little typing)

$ cat compare_ether_addr.cocci
@@
expression a,b;
@@
-	!compare_ether_addr(a, b)
+	ether_addr_equal(a, b)

@@
expression a,b;
@@
-	compare_ether_addr(a, b)
+	!ether_addr_equal(a, b)

@@
expression a,b;
@@
-	!ether_addr_equal(a, b) == 0
+	ether_addr_equal(a, b)

@@
expression a,b;
@@
-	!ether_addr_equal(a, b) != 0
+	!ether_addr_equal(a, b)

@@
expression a,b;
@@
-	ether_addr_equal(a, b) == 0
+	!ether_addr_equal(a, b)

@@
expression a,b;
@@
-	ether_addr_equal(a, b) != 0
+	ether_addr_equal(a, b)

@@
expression a,b;
@@
-	!!ether_addr_equal(a, b)
+	ether_addr_equal(a, b)

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent eed88971

drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c

+9 −9
Original line number Diff line number Diff line
@@ -1866,15 +1866,15 @@ static void rtl8192_TranslateRxSignalStuff(struct net_device *dev, 
	type = WLAN_FC_GET_TYPE(fc);

	praddr = hdr->addr1;



	bpacket_match_bssid = ((RTLLIB_FTYPE_CTL != type) &&

			(!compare_ether_addr(priv->rtllib->

			current_network.bssid,

	bpacket_match_bssid =

		((RTLLIB_FTYPE_CTL != type) &&

		 ether_addr_equal(priv->rtllib->current_network.bssid,

				  (fc & RTLLIB_FCTL_TODS) ? hdr->addr1 :

			   (fc & RTLLIB_FCTL_FROMDS) ? hdr->addr2 : hdr->addr3))

		&& (!pstats->bHwError) && (!pstats->bCRC) && (!pstats->bICV));

				  (fc & RTLLIB_FCTL_FROMDS) ? hdr->addr2 :

				  hdr->addr3) &&

		 (!pstats->bHwError) && (!pstats->bCRC) && (!pstats->bICV));

	bpacket_toself = bpacket_match_bssid &&		/* check this */

			  (!compare_ether_addr(praddr,

			  priv->rtllib->dev->dev_addr));

			 ether_addr_equal(praddr, priv->rtllib->dev->dev_addr);

	if (WLAN_FC_GET_FRAMETYPE(fc) == RTLLIB_STYPE_BEACON)

		bPacketBeacon = true;

	if (bpacket_match_bssid)

drivers/staging/rtl8192e/rtllib_rx.c

+6 −7
Original line number Diff line number Diff line
@@ -957,16 +957,15 @@ static void rtllib_rx_extract_addr(struct rtllib_device *ieee, 
static int rtllib_rx_data_filter(struct rtllib_device *ieee, u16 fc,

				 u8 *dst, u8 *src, u8 *bssid, u8 *addr2)

{

	u8 zero_addr[ETH_ALEN] = {0};

	u8 type, stype;



	type = WLAN_FC_GET_TYPE(fc);

	stype = WLAN_FC_GET_STYPE(fc);



	/* Filter frames from different BSS */

	if (((fc & RTLLIB_FCTL_DSTODS) != RTLLIB_FCTL_DSTODS)

		&& (compare_ether_addr(ieee->current_network.bssid, bssid) != 0)

		&& memcmp(ieee->current_network.bssid, zero_addr, ETH_ALEN)) {

	if (((fc & RTLLIB_FCTL_DSTODS) != RTLLIB_FCTL_DSTODS) &&

	    !ether_addr_equal(ieee->current_network.bssid, bssid) &&

	    !is_zero_ether_addr(ieee->current_network.bssid)) {

		return -1;

	}
@@ -974,8 +973,8 @@ static int rtllib_rx_data_filter(struct rtllib_device *ieee, u16 fc, 
	if (ieee->IntelPromiscuousModeInfo.bPromiscuousOn  &&

		ieee->IntelPromiscuousModeInfo.bFilterSourceStationFrame) {

		if ((fc & RTLLIB_FCTL_TODS) && !(fc & RTLLIB_FCTL_FROMDS) &&

			(compare_ether_addr(dst, ieee->current_network.bssid) != 0) &&

			(compare_ether_addr(bssid, ieee->current_network.bssid) == 0)) {

		    !ether_addr_equal(dst, ieee->current_network.bssid) &&

		    ether_addr_equal(bssid, ieee->current_network.bssid)) {

			return -1;

		}

	}
@@ -1275,7 +1274,7 @@ static int rtllib_rx_InfraAdhoc(struct rtllib_device *ieee, struct sk_buff *skb, 
	/*Filter pkt not to me*/

	multicast = is_multicast_ether_addr(hdr->addr1);

	unicast = !multicast;

	if (unicast && (compare_ether_addr(dev->dev_addr, hdr->addr1) != 0)) {

	if (unicast && !ether_addr_equal(dev->dev_addr, hdr->addr1)) {

		if (ieee->bNetPromiscuousMode)

			bToOtherSTA = true;

		else

drivers/staging/slicoss/slicoss.c

+3 −3
Original line number Diff line number Diff line
@@ -791,7 +791,7 @@ static bool slic_mac_filter(struct adapter *adapter, 
			struct mcast_address *mcaddr = adapter->mcastaddrs;



			while (mcaddr) {

				if (!compare_ether_addr(mcaddr->address,

				if (ether_addr_equal(mcaddr->address,

						     ether_frame->ether_dhost)) {

					adapter->rcv_multicasts++;

					netdev->stats.multicast++;
@@ -2333,7 +2333,7 @@ static int slic_mcast_add_list(struct adapter *adapter, char *address) 
	/* Check to see if it already exists */

	mlist = adapter->mcastaddrs;

	while (mlist) {

		if (!compare_ether_addr(mlist->address, address))

		if (ether_addr_equal(mlist->address, address))

			return 0;

		mlist = mlist->next;

	}

drivers/staging/vt6655/bssdb.c

+7 −4
Original line number Diff line number Diff line
@@ -148,7 +148,8 @@ BSSpSearchBSSList( 
			if (pDevice->bLinkPass == false) pCurrBSS->bSelected = false;

			if ((pCurrBSS->bActive) &&

			    (pCurrBSS->bSelected == false)) {

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

				if (ether_addr_equal(pCurrBSS->abyBSSID,

						     pbyBSSID)) {

					if (pSSID != NULL) {

						// compare ssid

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

		if (bKeepCurrBSSID) {

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

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

			    ether_addr_equal(pMgmt->sBSSList[ii].abyBSSID,

					     pMgmt->abyCurrBSSID)) {

				// bKeepCurrBSSID = false;

				continue;

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

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

		if (pBSSList->bActive) {

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

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

				if (pSSID->len == ((PWLAN_IE_SSID)pBSSList->abySSID)->len) {

					if (memcmp(pSSID->abySSID,

						   ((PWLAN_IE_SSID)pBSSList->abySSID)->abySSID,
@@ -733,7 +735,8 @@ BSSDBbIsSTAInNodeDB(void *pMgmtObject, unsigned char *abyDstAddr, 
	// Index = 0 reserved for AP Node

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

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

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

			if (ether_addr_equal(abyDstAddr,

					     pMgmt->sNodeDBTable[ii].abyMACAddr)) {

				*puNodeIndex = ii;

				return true;

			}

drivers/staging/vt6655/dpc.c

+4 −3
Original line number Diff line number Diff line
@@ -172,9 +172,9 @@ s_vProcessRxMACHeader(PSDevice pDevice, unsigned char *pbyRxBufferAddr, 
	};



	pbyRxBuffer = (unsigned char *)(pbyRxBufferAddr + cbHeaderSize);

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

	if (ether_addr_equal(pbyRxBuffer, pDevice->abySNAP_Bridgetunnel)) {

		cbHeaderSize += 6;

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

	} else if (ether_addr_equal(pbyRxBuffer, pDevice->abySNAP_RFC1042)) {

		cbHeaderSize += 6;

		pwType = (unsigned short *)(pbyRxBufferAddr + cbHeaderSize);

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



	// filter packet send from myself

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

	if (ether_addr_equal(pDevice->sRxEthHeader.abySrcAddr,

			     pDevice->abyCurrentNetAddr))

		return false;



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