Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

atm: Convert compare_ether_addr to ether_addr_equal

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

Done via cocci script:

$ 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: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Joe Perches and committed by
David S. Miller
150238eb 9a7b6ef9

+4 -5
+3 -3
net/atm/lec.c
··· 1255 1255 struct sk_buff *skb; 1256 1256 struct lec_priv *priv = netdev_priv(dev); 1257 1257 1258 - if (compare_ether_addr(lan_dst, dev->dev_addr)) 1258 + if (!ether_addr_equal(lan_dst, dev->dev_addr)) 1259 1259 return 0; /* not our mac address */ 1260 1260 1261 1261 kfree(priv->tlvs); /* NULL if there was no previous association */ ··· 1662 1662 1663 1663 head = &priv->lec_arp_tables[HASH(mac_addr[ETH_ALEN - 1])]; 1664 1664 hlist_for_each_entry(entry, node, head, next) { 1665 - if (!compare_ether_addr(mac_addr, entry->mac_addr)) 1665 + if (ether_addr_equal(mac_addr, entry->mac_addr)) 1666 1666 return entry; 1667 1667 } 1668 1668 return NULL; ··· 1849 1849 case 1: 1850 1850 return priv->mcast_vcc; 1851 1851 case 2: /* LANE2 wants arp for multicast addresses */ 1852 - if (!compare_ether_addr(mac_to_find, bus_mac)) 1852 + if (ether_addr_equal(mac_to_find, bus_mac)) 1853 1853 return priv->mcast_vcc; 1854 1854 break; 1855 1855 default:
+1 -2
net/atm/mpc.c
··· 592 592 goto non_ip; 593 593 594 594 while (i < mpc->number_of_mps_macs) { 595 - if (!compare_ether_addr(eth->h_dest, 596 - (mpc->mps_macs + i*ETH_ALEN))) 595 + if (ether_addr_equal(eth->h_dest, mpc->mps_macs + i * ETH_ALEN)) 597 596 if (send_via_shortcut(skb, mpc) == 0) /* try shortcut */ 598 597 return NETDEV_TX_OK; 599 598 i++;