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>

diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
index efea35b02e7ff989745c53844b06ab190d0fcc6a..6089f0cf23b480e4686916823cecafd681a64f42 100644 (file)
--- a/net/8021q/vlan.c
+++ b/net/8021q/vlan.c
@@ -266,19 +266,19 @@ static void vlan_sync_address(struct net_device *dev,
        struct vlan_dev_priv *vlan = vlan_dev_priv(vlandev);
 
        /* 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;
 
        /* vlan address was different from the old address and is equal to
         * the new address */
-       if (compare_ether_addr(vlandev->dev_addr, vlan->real_dev_addr) &&
-           !compare_ether_addr(vlandev->dev_addr, dev->dev_addr))
+       if (!ether_addr_equal(vlandev->dev_addr, vlan->real_dev_addr) &&
+           ether_addr_equal(vlandev->dev_addr, dev->dev_addr))
                dev_uc_del(dev, vlandev->dev_addr);
 
        /* vlan address was equal to the old address and is different from
         * the new address */
-       if (!compare_ether_addr(vlandev->dev_addr, vlan->real_dev_addr) &&
-           compare_ether_addr(vlandev->dev_addr, dev->dev_addr))
+       if (ether_addr_equal(vlandev->dev_addr, vlan->real_dev_addr) &&
+           !ether_addr_equal(vlandev->dev_addr, dev->dev_addr))
                dev_uc_add(dev, vlandev->dev_addr);
 
        memcpy(vlan->real_dev_addr, dev->dev_addr, ETH_ALEN);

diff --git a/net/8021q/vlan_core.c b/net/8021q/vlan_core.c
index 4d39d802be2cb48dab7825ca4c2591c4fec013bb..8ca533c95de0346f181c1acd067a787c20a49f62 100644 (file)
--- a/net/8021q/vlan_core.c
+++ b/net/8021q/vlan_core.c
@@ -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.
                 * This allows the VLAN to have a different MAC than the
                 * underlying device, and still route correctly. */
-               if (!compare_ether_addr(eth_hdr(skb)->h_dest,
-                                       vlan_dev->dev_addr))
+               if (ether_addr_equal(eth_hdr(skb)->h_dest, vlan_dev->dev_addr))
                        skb->pkt_type = PACKET_HOST;
        }
 

diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c
index 9988d4abb372b16a4c70995a047a87548aead7e4..eaf5f21b0ef7473853bb5fec3be25f7f71c205f2 100644 (file)
--- a/net/8021q/vlan_dev.c
+++ b/net/8021q/vlan_dev.c
@@ -277,7 +277,7 @@ static int vlan_dev_open(struct net_device *dev)
            !(vlan->flags & VLAN_FLAG_LOOSE_BINDING))
                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);
                if (err < 0)
                        goto out;
@@ -307,7 +307,7 @@ clear_allmulti:
        if (dev->flags & IFF_ALLMULTI)
                dev_set_allmulti(real_dev, -1);
 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);
 out:
        netif_carrier_off(dev);
@@ -326,7 +326,7 @@ static int vlan_dev_stop(struct net_device *dev)
        if (dev->flags & IFF_PROMISC)
                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);
 
        netif_carrier_off(dev);
@@ -345,13 +345,13 @@ static int vlan_dev_set_mac_address(struct net_device *dev, void *p)
        if (!(dev->flags & IFF_UP))
                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);
                if (err < 0)
                        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);
 
 out: