Commit 8561cf99 authored by Joe Perches's avatar Joe Perches Committed by David S. Miller

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: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3bc7945e
...@@ -111,7 +111,7 @@ bitmap_ipmac_test(struct ip_set *set, void *value, u32 timeout, u32 flags) ...@@ -111,7 +111,7 @@ bitmap_ipmac_test(struct ip_set *set, void *value, u32 timeout, u32 flags)
return -EAGAIN; return -EAGAIN;
case MAC_FILLED: case MAC_FILLED:
return data->ether == NULL || return data->ether == NULL ||
compare_ether_addr(data->ether, elem->ether) == 0; ether_addr_equal(data->ether, elem->ether);
} }
return 0; return 0;
} }
...@@ -225,7 +225,7 @@ bitmap_ipmac_ttest(struct ip_set *set, void *value, u32 timeout, u32 flags) ...@@ -225,7 +225,7 @@ bitmap_ipmac_ttest(struct ip_set *set, void *value, u32 timeout, u32 flags)
return -EAGAIN; return -EAGAIN;
case MAC_FILLED: case MAC_FILLED:
return (data->ether == NULL || return (data->ether == NULL ||
compare_ether_addr(data->ether, elem->ether) == 0) && ether_addr_equal(data->ether, elem->ether)) &&
!bitmap_expired(map, data->id); !bitmap_expired(map, data->id);
} }
return 0; return 0;
......
...@@ -36,7 +36,7 @@ static bool mac_mt(const struct sk_buff *skb, struct xt_action_param *par) ...@@ -36,7 +36,7 @@ static bool mac_mt(const struct sk_buff *skb, struct xt_action_param *par)
return false; return false;
if (skb_mac_header(skb) + ETH_HLEN > skb->data) if (skb_mac_header(skb) + ETH_HLEN > skb->data)
return false; return false;
ret = compare_ether_addr(eth_hdr(skb)->h_source, info->srcaddr) == 0; ret = ether_addr_equal(eth_hdr(skb)->h_source, info->srcaddr);
ret ^= info->invert; ret ^= info->invert;
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment