aboutsummaryrefslogtreecommitdiffstats
path: root/net/atm
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2012-05-08 14:56:50 -0400
committerDavid S. Miller <davem@davemloft.net>2012-05-09 20:49:17 -0400
commit150238ebb4a1ad2c3d09aea754720ad2e898c59f (patch)
tree9ff803ca540794241bfd07cebde9cc19593a5af6 /net/atm
parent9a7b6ef9b9938a1f5cb91ccc0b713b9443edc79f (diff)
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>
Diffstat (limited to 'net/atm')
-rw-r--r--net/atm/lec.c6
-rw-r--r--net/atm/mpc.c3
2 files changed, 4 insertions, 5 deletions
diff --git a/net/atm/lec.c b/net/atm/lec.c
index f1964caa0f83..bb35cb76b3af 100644
--- 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,
1255 struct sk_buff *skb; 1255 struct sk_buff *skb;
1256 struct lec_priv *priv = netdev_priv(dev); 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 return 0; /* not our mac address */ 1259 return 0; /* not our mac address */
1260 1260
1261 kfree(priv->tlvs); /* NULL if there was no previous association */ 1261 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,
1662 1662
1663 head = &priv->lec_arp_tables[HASH(mac_addr[ETH_ALEN - 1])]; 1663 head = &priv->lec_arp_tables[HASH(mac_addr[ETH_ALEN - 1])];
1664 hlist_for_each_entry(entry, node, head, next) { 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 return entry; 1666 return entry;
1667 } 1667 }
1668 return NULL; 1668 return NULL;
@@ -1849,7 +1849,7 @@ static struct atm_vcc *lec_arp_resolve(struct lec_priv *priv,
1849 case 1: 1849 case 1:
1850 return priv->mcast_vcc; 1850 return priv->mcast_vcc;
1851 case 2: /* LANE2 wants arp for multicast addresses */ 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 return priv->mcast_vcc; 1853 return priv->mcast_vcc;
1854 break; 1854 break;
1855 default: 1855 default:
diff --git a/net/atm/mpc.c b/net/atm/mpc.c
index aa972409f093..d4cc1be5c364 100644
--- 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,
592 goto non_ip; 592 goto non_ip;
593 593
594 while (i < mpc->number_of_mps_macs) { 594 while (i < mpc->number_of_mps_macs) {
595 if (!compare_ether_addr(eth->h_dest, 595 if (ether_addr_equal(eth->h_dest, mpc->mps_macs + i * ETH_ALEN))
596 (mpc->mps_macs + i*ETH_ALEN)))
597 if (send_via_shortcut(skb, mpc) == 0) /* try shortcut */ 596 if (send_via_shortcut(skb, mpc) == 0) /* try shortcut */
598 return NETDEV_TX_OK; 597 return NETDEV_TX_OK;
599 i++; 598 i++;