diff options
author | Joe Perches <joe@perches.com> | 2012-05-08 14:56:49 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-05-09 20:49:17 -0400 |
commit | 9a7b6ef9b9938a1f5cb91ccc0b713b9443edc79f (patch) | |
tree | 9fcdd72bb2adb4e481bf30aa0143d65627ebd637 /net/bridge/br_device.c | |
parent | 171fe5ef140571c7465e625e9cd9fdf3340ad20e (diff) |
bridge: 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/bridge/br_device.c')
-rw-r--r-- | net/bridge/br_device.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c index d6e5929458b1..929e48aed444 100644 --- a/net/bridge/br_device.c +++ b/net/bridge/br_device.c | |||
@@ -170,7 +170,7 @@ static int br_set_mac_address(struct net_device *dev, void *p) | |||
170 | return -EADDRNOTAVAIL; | 170 | return -EADDRNOTAVAIL; |
171 | 171 | ||
172 | spin_lock_bh(&br->lock); | 172 | spin_lock_bh(&br->lock); |
173 | if (compare_ether_addr(dev->dev_addr, addr->sa_data)) { | 173 | if (!ether_addr_equal(dev->dev_addr, addr->sa_data)) { |
174 | dev->addr_assign_type &= ~NET_ADDR_RANDOM; | 174 | dev->addr_assign_type &= ~NET_ADDR_RANDOM; |
175 | memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN); | 175 | memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN); |
176 | br_fdb_change_mac_address(br, addr->sa_data); | 176 | br_fdb_change_mac_address(br, addr->sa_data); |