Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 29e3b160 authored by YOSHIFUJI Hideaki / 吉藤英明's avatar YOSHIFUJI Hideaki / 吉藤英明 Committed by David S. Miller
Browse files

netfilter ipset: Use ipv6_addr_equal() where appropriate. 



Signed-off-by: default avatarYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d9e85655

net/netfilter/ipset/ip_set_hash_ip.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -234,7 +234,7 @@ hash_ip6_data_equal(const struct hash_ip6_elem *ip1, 
		    const struct hash_ip6_elem *ip2,

		    const struct hash_ip6_elem *ip2,

		    u32 *multi)

		    u32 *multi)

{

{

	return ipv6_addr_cmp(&ip1->ip.in6, &ip2->ip.in6) == 0;

	return ipv6_addr_equal(&ip1->ip.in6, &ip2->ip.in6);

}

}





static inline bool

static inline bool

net/netfilter/ipset/ip_set_hash_ipport.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -284,7 +284,7 @@ hash_ipport6_data_equal(const struct hash_ipport6_elem *ip1, 
			const struct hash_ipport6_elem *ip2,

			const struct hash_ipport6_elem *ip2,

			u32 *multi)

			u32 *multi)

{

{

	return ipv6_addr_cmp(&ip1->ip.in6, &ip2->ip.in6) == 0 &&

	return ipv6_addr_equal(&ip1->ip.in6, &ip2->ip.in6) &&

	       ip1->port == ip2->port &&

	       ip1->port == ip2->port &&

	       ip1->proto == ip2->proto;

	       ip1->proto == ip2->proto;

}

}

net/netfilter/ipset/ip_set_hash_ipportip.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -294,8 +294,8 @@ hash_ipportip6_data_equal(const struct hash_ipportip6_elem *ip1, 
			  const struct hash_ipportip6_elem *ip2,

			  const struct hash_ipportip6_elem *ip2,

			  u32 *multi)

			  u32 *multi)

{

{

	return ipv6_addr_cmp(&ip1->ip.in6, &ip2->ip.in6) == 0 &&

	return ipv6_addr_equal(&ip1->ip.in6, &ip2->ip.in6) &&

	       ipv6_addr_cmp(&ip1->ip2.in6, &ip2->ip2.in6) == 0 &&

	       ipv6_addr_equal(&ip1->ip2.in6, &ip2->ip2.in6) &&

	       ip1->port == ip2->port &&

	       ip1->port == ip2->port &&

	       ip1->proto == ip2->proto;

	       ip1->proto == ip2->proto;

}

}

net/netfilter/ipset/ip_set_hash_ipportnet.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -388,8 +388,8 @@ hash_ipportnet6_data_equal(const struct hash_ipportnet6_elem *ip1, 
			   const struct hash_ipportnet6_elem *ip2,

			   const struct hash_ipportnet6_elem *ip2,

			   u32 *multi)

			   u32 *multi)

{

{

	return ipv6_addr_cmp(&ip1->ip.in6, &ip2->ip.in6) == 0 &&

	return ipv6_addr_equal(&ip1->ip.in6, &ip2->ip.in6) &&

	       ipv6_addr_cmp(&ip1->ip2.in6, &ip2->ip2.in6) == 0 &&

	       ipv6_addr_equal(&ip1->ip2.in6, &ip2->ip2.in6) &&

	       ip1->cidr == ip2->cidr &&

	       ip1->cidr == ip2->cidr &&

	       ip1->port == ip2->port &&

	       ip1->port == ip2->port &&

	       ip1->proto == ip2->proto;

	       ip1->proto == ip2->proto;

net/netfilter/ipset/ip_set_hash_net.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -286,7 +286,7 @@ hash_net6_data_equal(const struct hash_net6_elem *ip1, 
		     const struct hash_net6_elem *ip2,

		     const struct hash_net6_elem *ip2,

		     u32 *multi)

		     u32 *multi)

{

{

	return ipv6_addr_cmp(&ip1->ip.in6, &ip2->ip.in6) == 0 &&

	return ipv6_addr_equal(&ip1->ip.in6, &ip2->ip.in6) &&

	       ip1->cidr == ip2->cidr;

	       ip1->cidr == ip2->cidr;

}

}