diff options
author | Joe Perches <joe@perches.com> | 2012-05-08 14:56:54 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-05-09 20:49:18 -0400 |
commit | 8561cf99785faf73cccb9f417170d8b5844bf496 (patch) | |
tree | ff213744b29817bdb922ffe7661da97eec0b7c53 /net/netfilter | |
parent | 3bc7945e2642bcea92b0fd6a718565f45061439f (diff) |
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>
Diffstat (limited to 'net/netfilter')
-rw-r--r-- | net/netfilter/ipset/ip_set_bitmap_ipmac.c | 4 | ||||
-rw-r--r-- | net/netfilter/xt_mac.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/net/netfilter/ipset/ip_set_bitmap_ipmac.c b/net/netfilter/ipset/ip_set_bitmap_ipmac.c index 0bb16c469a89..d7eaf10edb6d 100644 --- a/net/netfilter/ipset/ip_set_bitmap_ipmac.c +++ b/net/netfilter/ipset/ip_set_bitmap_ipmac.c | |||
@@ -111,7 +111,7 @@ bitmap_ipmac_test(struct ip_set *set, void *value, u32 timeout, u32 flags) | |||
111 | return -EAGAIN; | 111 | return -EAGAIN; |
112 | case MAC_FILLED: | 112 | case MAC_FILLED: |
113 | return data->ether == NULL || | 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 | return 0; | 116 | return 0; |
117 | } | 117 | } |
@@ -225,7 +225,7 @@ bitmap_ipmac_ttest(struct ip_set *set, void *value, u32 timeout, u32 flags) | |||
225 | return -EAGAIN; | 225 | return -EAGAIN; |
226 | case MAC_FILLED: | 226 | case MAC_FILLED: |
227 | return (data->ether == NULL || | 227 | return (data->ether == NULL || |
228 | compare_ether_addr(data->ether, elem->ether) == 0) && | 228 | ether_addr_equal(data->ether, elem->ether)) && |
229 | !bitmap_expired(map, data->id); | 229 | !bitmap_expired(map, data->id); |
230 | } | 230 | } |
231 | return 0; | 231 | return 0; |
diff --git a/net/netfilter/xt_mac.c b/net/netfilter/xt_mac.c index 8160f6b1435d..d5b4fd4f91ed 100644 --- a/net/netfilter/xt_mac.c +++ b/net/netfilter/xt_mac.c | |||
@@ -36,7 +36,7 @@ static bool mac_mt(const struct sk_buff *skb, struct xt_action_param *par) | |||
36 | return false; | 36 | return false; |
37 | if (skb_mac_header(skb) + ETH_HLEN > skb->data) | 37 | if (skb_mac_header(skb) + ETH_HLEN > skb->data) |
38 | return false; | 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 | ret ^= info->invert; | 40 | ret ^= info->invert; |
41 | return ret; | 41 | return ret; |
42 | } | 42 | } |