Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

bridge: netfilter: 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>
Acked-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Joe Perches and committed by
David S. Miller
171fe5ef 53a2b3a1

+2 -2
+2 -2
net/bridge/netfilter/ebt_stp.c
··· 164 164 !(info->bitmask & EBT_STP_MASK)) 165 165 return -EINVAL; 166 166 /* Make sure the match only receives stp frames */ 167 - if (compare_ether_addr(e->destmac, bridge_ula) || 168 - compare_ether_addr(e->destmsk, msk) || !(e->bitmask & EBT_DESTMAC)) 167 + if (!ether_addr_equal(e->destmac, bridge_ula) || 168 + !ether_addr_equal(e->destmsk, msk) || !(e->bitmask & EBT_DESTMAC)) 169 169 return -EINVAL; 170 170 171 171 return 0;