diff options
author | Joe Perches <joe@perches.com> | 2012-05-09 13:17:46 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-05-10 23:33:01 -0400 |
commit | 2e42e4747ea72943c21551d8a206b51a9893b1e0 (patch) | |
tree | a92473c485911b51e1d960c9c8fa34dfc9be0a46 /drivers/net/ethernet/dec | |
parent | 39f1d94d300a58eb3e9b851d077cada4e2fa9d46 (diff) |
drivers/net: 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 'drivers/net/ethernet/dec')
-rw-r--r-- | drivers/net/ethernet/dec/ewrk3.c | 3 | ||||
-rw-r--r-- | drivers/net/ethernet/dec/tulip/de4x5.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/ethernet/dec/ewrk3.c b/drivers/net/ethernet/dec/ewrk3.c index 1879f84a25a3..17ae8c619680 100644 --- a/drivers/net/ethernet/dec/ewrk3.c +++ b/drivers/net/ethernet/dec/ewrk3.c | |||
@@ -1016,7 +1016,8 @@ static int ewrk3_rx(struct net_device *dev) | |||
1016 | } else { | 1016 | } else { |
1017 | lp->pktStats.multicast++; | 1017 | lp->pktStats.multicast++; |
1018 | } | 1018 | } |
1019 | } else if (compare_ether_addr(p, dev->dev_addr) == 0) { | 1019 | } else if (ether_addr_equal(p, |
1020 | dev->dev_addr)) { | ||
1020 | lp->pktStats.unicast++; | 1021 | lp->pktStats.unicast++; |
1021 | } | 1022 | } |
1022 | lp->pktStats.bins[0]++; /* Duplicates stats.rx_packets */ | 1023 | lp->pktStats.bins[0]++; /* Duplicates stats.rx_packets */ |
diff --git a/drivers/net/ethernet/dec/tulip/de4x5.c b/drivers/net/ethernet/dec/tulip/de4x5.c index 18b106cc6d2b..d3cd489d11a2 100644 --- a/drivers/net/ethernet/dec/tulip/de4x5.c +++ b/drivers/net/ethernet/dec/tulip/de4x5.c | |||
@@ -1874,7 +1874,7 @@ de4x5_local_stats(struct net_device *dev, char *buf, int pkt_len) | |||
1874 | } else { | 1874 | } else { |
1875 | lp->pktStats.multicast++; | 1875 | lp->pktStats.multicast++; |
1876 | } | 1876 | } |
1877 | } else if (compare_ether_addr(buf, dev->dev_addr) == 0) { | 1877 | } else if (ether_addr_equal(buf, dev->dev_addr)) { |
1878 | lp->pktStats.unicast++; | 1878 | lp->pktStats.unicast++; |
1879 | } | 1879 | } |
1880 | 1880 | ||