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

8021q: 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
53a2b3a1 28b29801

+11 -12
+5 -5
net/8021q/vlan.c
··· 266 266 struct vlan_dev_priv *vlan = vlan_dev_priv(vlandev); 267 267 268 268 /* May be called without an actual change */ 269 - if (!compare_ether_addr(vlan->real_dev_addr, dev->dev_addr)) 269 + if (ether_addr_equal(vlan->real_dev_addr, dev->dev_addr)) 270 270 return; 271 271 272 272 /* vlan address was different from the old address and is equal to 273 273 * the new address */ 274 - if (compare_ether_addr(vlandev->dev_addr, vlan->real_dev_addr) && 275 - !compare_ether_addr(vlandev->dev_addr, dev->dev_addr)) 274 + if (!ether_addr_equal(vlandev->dev_addr, vlan->real_dev_addr) && 275 + ether_addr_equal(vlandev->dev_addr, dev->dev_addr)) 276 276 dev_uc_del(dev, vlandev->dev_addr); 277 277 278 278 /* vlan address was equal to the old address and is different from 279 279 * the new address */ 280 - if (!compare_ether_addr(vlandev->dev_addr, vlan->real_dev_addr) && 281 - compare_ether_addr(vlandev->dev_addr, dev->dev_addr)) 280 + if (ether_addr_equal(vlandev->dev_addr, vlan->real_dev_addr) && 281 + !ether_addr_equal(vlandev->dev_addr, dev->dev_addr)) 282 282 dev_uc_add(dev, vlandev->dev_addr); 283 283 284 284 memcpy(vlan->real_dev_addr, dev->dev_addr, ETH_ALEN);
+1 -2
net/8021q/vlan_core.c
··· 31 31 /* Our lower layer thinks this is not local, let's make sure. 32 32 * This allows the VLAN to have a different MAC than the 33 33 * underlying device, and still route correctly. */ 34 - if (!compare_ether_addr(eth_hdr(skb)->h_dest, 35 - vlan_dev->dev_addr)) 34 + if (ether_addr_equal(eth_hdr(skb)->h_dest, vlan_dev->dev_addr)) 36 35 skb->pkt_type = PACKET_HOST; 37 36 } 38 37
+5 -5
net/8021q/vlan_dev.c
··· 277 277 !(vlan->flags & VLAN_FLAG_LOOSE_BINDING)) 278 278 return -ENETDOWN; 279 279 280 - if (compare_ether_addr(dev->dev_addr, real_dev->dev_addr)) { 280 + if (!ether_addr_equal(dev->dev_addr, real_dev->dev_addr)) { 281 281 err = dev_uc_add(real_dev, dev->dev_addr); 282 282 if (err < 0) 283 283 goto out; ··· 307 307 if (dev->flags & IFF_ALLMULTI) 308 308 dev_set_allmulti(real_dev, -1); 309 309 del_unicast: 310 - if (compare_ether_addr(dev->dev_addr, real_dev->dev_addr)) 310 + if (!ether_addr_equal(dev->dev_addr, real_dev->dev_addr)) 311 311 dev_uc_del(real_dev, dev->dev_addr); 312 312 out: 313 313 netif_carrier_off(dev); ··· 326 326 if (dev->flags & IFF_PROMISC) 327 327 dev_set_promiscuity(real_dev, -1); 328 328 329 - if (compare_ether_addr(dev->dev_addr, real_dev->dev_addr)) 329 + if (!ether_addr_equal(dev->dev_addr, real_dev->dev_addr)) 330 330 dev_uc_del(real_dev, dev->dev_addr); 331 331 332 332 netif_carrier_off(dev); ··· 345 345 if (!(dev->flags & IFF_UP)) 346 346 goto out; 347 347 348 - if (compare_ether_addr(addr->sa_data, real_dev->dev_addr)) { 348 + if (!ether_addr_equal(addr->sa_data, real_dev->dev_addr)) { 349 349 err = dev_uc_add(real_dev, addr->sa_data); 350 350 if (err < 0) 351 351 return err; 352 352 } 353 353 354 - if (compare_ether_addr(dev->dev_addr, real_dev->dev_addr)) 354 + if (!ether_addr_equal(dev->dev_addr, real_dev->dev_addr)) 355 355 dev_uc_del(real_dev, dev->dev_addr); 356 356 357 357 out: