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>

diff --git a/net/atm/lec.c b/net/atm/lec.c
index f1964caa0f83862b792107f024efee3ed0b54745..bb35cb76b3afe1c94f2e119fc3946f8630c2f930 100644 (file)
--- a/net/atm/lec.c
+++ b/net/atm/lec.c
@@ -1255,7 +1255,7 @@ static int lane2_associate_req(struct net_device *dev, const u8 *lan_dst,
        struct sk_buff *skb;
        struct lec_priv *priv = netdev_priv(dev);
 
-       if (compare_ether_addr(lan_dst, dev->dev_addr))
+       if (!ether_addr_equal(lan_dst, dev->dev_addr))
                return 0;       /* not our mac address */
 
        kfree(priv->tlvs);      /* NULL if there was no previous association */
@@ -1662,7 +1662,7 @@ static struct lec_arp_table *lec_arp_find(struct lec_priv *priv,
 
        head = &priv->lec_arp_tables[HASH(mac_addr[ETH_ALEN - 1])];
        hlist_for_each_entry(entry, node, head, next) {
-               if (!compare_ether_addr(mac_addr, entry->mac_addr))
+               if (ether_addr_equal(mac_addr, entry->mac_addr))
                        return entry;
        }
        return NULL;
@@ -1849,7 +1849,7 @@ static struct atm_vcc *lec_arp_resolve(struct lec_priv *priv,
                case 1:
                        return priv->mcast_vcc;
                case 2: /* LANE2 wants arp for multicast addresses */
-                       if (!compare_ether_addr(mac_to_find, bus_mac))
+                       if (ether_addr_equal(mac_to_find, bus_mac))
                                return priv->mcast_vcc;
                        break;
                default:

diff --git a/net/atm/mpc.c b/net/atm/mpc.c
index aa972409f0934845eddd15bb16d0b82d44770986..d4cc1be5c36469ea2b24b7dbb9375e364e6986b0 100644 (file)
--- a/net/atm/mpc.c
+++ b/net/atm/mpc.c
@@ -592,8 +592,7 @@ static netdev_tx_t mpc_send_packet(struct sk_buff *skb,
                goto non_ip;
 
        while (i < mpc->number_of_mps_macs) {
-               if (!compare_ether_addr(eth->h_dest,
-                                       (mpc->mps_macs + i*ETH_ALEN)))
+               if (ether_addr_equal(eth->h_dest, mpc->mps_macs + i * ETH_ALEN))
                        if (send_via_shortcut(skb, mpc) == 0) /* try shortcut */
                                return NETDEV_TX_OK;
                i++;