Commit 53a2b3a1 authored by Joe Perches's avatar Joe Perches Committed by David S. Miller

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: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 28b29801
...@@ -266,19 +266,19 @@ static void vlan_sync_address(struct net_device *dev, ...@@ -266,19 +266,19 @@ static void vlan_sync_address(struct net_device *dev,
struct vlan_dev_priv *vlan = vlan_dev_priv(vlandev); struct vlan_dev_priv *vlan = vlan_dev_priv(vlandev);
/* May be called without an actual change */ /* May be called without an actual change */
if (!compare_ether_addr(vlan->real_dev_addr, dev->dev_addr)) if (ether_addr_equal(vlan->real_dev_addr, dev->dev_addr))
return; return;
/* vlan address was different from the old address and is equal to /* vlan address was different from the old address and is equal to
* the new address */ * the new address */
if (compare_ether_addr(vlandev->dev_addr, vlan->real_dev_addr) && if (!ether_addr_equal(vlandev->dev_addr, vlan->real_dev_addr) &&
!compare_ether_addr(vlandev->dev_addr, dev->dev_addr)) ether_addr_equal(vlandev->dev_addr, dev->dev_addr))
dev_uc_del(dev, vlandev->dev_addr); dev_uc_del(dev, vlandev->dev_addr);
/* vlan address was equal to the old address and is different from /* vlan address was equal to the old address and is different from
* the new address */ * the new address */
if (!compare_ether_addr(vlandev->dev_addr, vlan->real_dev_addr) && if (ether_addr_equal(vlandev->dev_addr, vlan->real_dev_addr) &&
compare_ether_addr(vlandev->dev_addr, dev->dev_addr)) !ether_addr_equal(vlandev->dev_addr, dev->dev_addr))
dev_uc_add(dev, vlandev->dev_addr); dev_uc_add(dev, vlandev->dev_addr);
memcpy(vlan->real_dev_addr, dev->dev_addr, ETH_ALEN); memcpy(vlan->real_dev_addr, dev->dev_addr, ETH_ALEN);
......
...@@ -31,8 +31,7 @@ bool vlan_do_receive(struct sk_buff **skbp, bool last_handler) ...@@ -31,8 +31,7 @@ bool vlan_do_receive(struct sk_buff **skbp, bool last_handler)
/* Our lower layer thinks this is not local, let's make sure. /* Our lower layer thinks this is not local, let's make sure.
* This allows the VLAN to have a different MAC than the * This allows the VLAN to have a different MAC than the
* underlying device, and still route correctly. */ * underlying device, and still route correctly. */
if (!compare_ether_addr(eth_hdr(skb)->h_dest, if (ether_addr_equal(eth_hdr(skb)->h_dest, vlan_dev->dev_addr))
vlan_dev->dev_addr))
skb->pkt_type = PACKET_HOST; skb->pkt_type = PACKET_HOST;
} }
......
...@@ -277,7 +277,7 @@ static int vlan_dev_open(struct net_device *dev) ...@@ -277,7 +277,7 @@ static int vlan_dev_open(struct net_device *dev)
!(vlan->flags & VLAN_FLAG_LOOSE_BINDING)) !(vlan->flags & VLAN_FLAG_LOOSE_BINDING))
return -ENETDOWN; return -ENETDOWN;
if (compare_ether_addr(dev->dev_addr, real_dev->dev_addr)) { if (!ether_addr_equal(dev->dev_addr, real_dev->dev_addr)) {
err = dev_uc_add(real_dev, dev->dev_addr); err = dev_uc_add(real_dev, dev->dev_addr);
if (err < 0) if (err < 0)
goto out; goto out;
...@@ -307,7 +307,7 @@ static int vlan_dev_open(struct net_device *dev) ...@@ -307,7 +307,7 @@ static int vlan_dev_open(struct net_device *dev)
if (dev->flags & IFF_ALLMULTI) if (dev->flags & IFF_ALLMULTI)
dev_set_allmulti(real_dev, -1); dev_set_allmulti(real_dev, -1);
del_unicast: del_unicast:
if (compare_ether_addr(dev->dev_addr, real_dev->dev_addr)) if (!ether_addr_equal(dev->dev_addr, real_dev->dev_addr))
dev_uc_del(real_dev, dev->dev_addr); dev_uc_del(real_dev, dev->dev_addr);
out: out:
netif_carrier_off(dev); netif_carrier_off(dev);
...@@ -326,7 +326,7 @@ static int vlan_dev_stop(struct net_device *dev) ...@@ -326,7 +326,7 @@ static int vlan_dev_stop(struct net_device *dev)
if (dev->flags & IFF_PROMISC) if (dev->flags & IFF_PROMISC)
dev_set_promiscuity(real_dev, -1); dev_set_promiscuity(real_dev, -1);
if (compare_ether_addr(dev->dev_addr, real_dev->dev_addr)) if (!ether_addr_equal(dev->dev_addr, real_dev->dev_addr))
dev_uc_del(real_dev, dev->dev_addr); dev_uc_del(real_dev, dev->dev_addr);
netif_carrier_off(dev); netif_carrier_off(dev);
...@@ -345,13 +345,13 @@ static int vlan_dev_set_mac_address(struct net_device *dev, void *p) ...@@ -345,13 +345,13 @@ static int vlan_dev_set_mac_address(struct net_device *dev, void *p)
if (!(dev->flags & IFF_UP)) if (!(dev->flags & IFF_UP))
goto out; goto out;
if (compare_ether_addr(addr->sa_data, real_dev->dev_addr)) { if (!ether_addr_equal(addr->sa_data, real_dev->dev_addr)) {
err = dev_uc_add(real_dev, addr->sa_data); err = dev_uc_add(real_dev, addr->sa_data);
if (err < 0) if (err < 0)
return err; return err;
} }
if (compare_ether_addr(dev->dev_addr, real_dev->dev_addr)) if (!ether_addr_equal(dev->dev_addr, real_dev->dev_addr))
dev_uc_del(real_dev, dev->dev_addr); dev_uc_del(real_dev, dev->dev_addr);
out: out:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment