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

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>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Joe Perches and committed by
David S. Miller
8561cf99 3bc7945e

+3 -3
+2 -2
net/netfilter/ipset/ip_set_bitmap_ipmac.c
··· 111 111 return -EAGAIN; 112 112 case MAC_FILLED: 113 113 return data->ether == NULL || 114 - compare_ether_addr(data->ether, elem->ether) == 0; 114 + ether_addr_equal(data->ether, elem->ether); 115 115 } 116 116 return 0; 117 117 } ··· 225 225 return -EAGAIN; 226 226 case MAC_FILLED: 227 227 return (data->ether == NULL || 228 - compare_ether_addr(data->ether, elem->ether) == 0) && 228 + ether_addr_equal(data->ether, elem->ether)) && 229 229 !bitmap_expired(map, data->id); 230 230 } 231 231 return 0;
+1 -1
net/netfilter/xt_mac.c
··· 36 36 return false; 37 37 if (skb_mac_header(skb) + ETH_HLEN > skb->data) 38 38 return false; 39 - ret = compare_ether_addr(eth_hdr(skb)->h_source, info->srcaddr) == 0; 39 + ret = ether_addr_equal(eth_hdr(skb)->h_source, info->srcaddr); 40 40 ret ^= info->invert; 41 41 return ret; 42 42 }