netfilter: ipset: Move often used IPv6 address masking function to header file

Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/include/linux/netfilter/ipset/pfxlen.h b/include/linux/netfilter/ipset/pfxlen.h
index 199fd11fedc076a8c8364b17857fdd5a6192f652..1afbb94b4b65739eb04134c58a64fde586a92087 100644 (file)
--- a/include/linux/netfilter/ipset/pfxlen.h
+++ b/include/linux/netfilter/ipset/pfxlen.h
@@ -41,4 +41,13 @@ do {                                         \
        to = from | ~ip_set_hostmask(cidr);     \
 } while (0)
 
+static inline void
+ip6_netmask(union nf_inet_addr *ip, u8 prefix)
+{
+       ip->ip6[0] &= ip_set_netmask6(prefix)[0];
+       ip->ip6[1] &= ip_set_netmask6(prefix)[1];
+       ip->ip6[2] &= ip_set_netmask6(prefix)[2];
+       ip->ip6[3] &= ip_set_netmask6(prefix)[3];
+}
+
 #endif /*_PFXLEN_H */

diff --git a/net/netfilter/ipset/ip_set_hash_ip.c b/net/netfilter/ipset/ip_set_hash_ip.c
index b7d4cb475ae69ab088e33eef7589d06da81851e0..c486ad2d43b70391636cbffcbfafc6a12a558b0d 100644 (file)
--- a/net/netfilter/ipset/ip_set_hash_ip.c
+++ b/net/netfilter/ipset/ip_set_hash_ip.c
@@ -255,15 +255,6 @@ hash_ip6_data_zero_out(struct hash_ip6_elem *elem)
        ipv6_addr_set(&elem->ip.in6, 0, 0, 0, 0);
 }
 
-static inline void
-ip6_netmask(union nf_inet_addr *ip, u8 prefix)
-{
-       ip->ip6[0] &= ip_set_netmask6(prefix)[0];
-       ip->ip6[1] &= ip_set_netmask6(prefix)[1];
-       ip->ip6[2] &= ip_set_netmask6(prefix)[2];
-       ip->ip6[3] &= ip_set_netmask6(prefix)[3];
-}
-
 static bool
 hash_ip6_data_list(struct sk_buff *skb, const struct hash_ip6_elem *data)
 {

diff --git a/net/netfilter/ipset/ip_set_hash_ipportnet.c b/net/netfilter/ipset/ip_set_hash_ipportnet.c
index b4836c81fbb765dddda97792ffc6348dc568eae3..352f8b4a63e5fa7e9f09e07b7a0562a31ea730c2 100644 (file)
--- a/net/netfilter/ipset/ip_set_hash_ipportnet.c
+++ b/net/netfilter/ipset/ip_set_hash_ipportnet.c
@@ -445,15 +445,6 @@ hash_ipportnet6_data_zero_out(struct hash_ipportnet6_elem *elem)
        elem->proto = 0;
 }
 
-static inline void
-ip6_netmask(union nf_inet_addr *ip, u8 prefix)
-{
-       ip->ip6[0] &= ip_set_netmask6(prefix)[0];
-       ip->ip6[1] &= ip_set_netmask6(prefix)[1];
-       ip->ip6[2] &= ip_set_netmask6(prefix)[2];
-       ip->ip6[3] &= ip_set_netmask6(prefix)[3];
-}
-
 static inline void
 hash_ipportnet6_data_netmask(struct hash_ipportnet6_elem *elem, u8 cidr)
 {

diff --git a/net/netfilter/ipset/ip_set_hash_net.c b/net/netfilter/ipset/ip_set_hash_net.c
index 6dbe0afc5a8dc0a25031647689896ee325656f36..370947c65b206b17e38c7b31adef7c20ce4ff4d6 100644 (file)
--- a/net/netfilter/ipset/ip_set_hash_net.c
+++ b/net/netfilter/ipset/ip_set_hash_net.c
@@ -342,15 +342,6 @@ hash_net6_data_zero_out(struct hash_net6_elem *elem)
        elem->cidr = 0;
 }
 
-static inline void
-ip6_netmask(union nf_inet_addr *ip, u8 prefix)
-{
-       ip->ip6[0] &= ip_set_netmask6(prefix)[0];
-       ip->ip6[1] &= ip_set_netmask6(prefix)[1];
-       ip->ip6[2] &= ip_set_netmask6(prefix)[2];
-       ip->ip6[3] &= ip_set_netmask6(prefix)[3];
-}
-
 static inline void
 hash_net6_data_netmask(struct hash_net6_elem *elem, u8 cidr)
 {

diff --git a/net/netfilter/ipset/ip_set_hash_netiface.c b/net/netfilter/ipset/ip_set_hash_netiface.c
index 248162020d80185e5a1669843176298ebcc1f9f7..dd9843e3b06c7adfeffde1178205c3f829243b0c 100644 (file)
--- a/net/netfilter/ipset/ip_set_hash_netiface.c
+++ b/net/netfilter/ipset/ip_set_hash_netiface.c
@@ -528,15 +528,6 @@ hash_netiface6_data_zero_out(struct hash_netiface6_elem *elem)
        elem->elem = 0;
 }
 
-static inline void
-ip6_netmask(union nf_inet_addr *ip, u8 prefix)
-{
-       ip->ip6[0] &= ip_set_netmask6(prefix)[0];
-       ip->ip6[1] &= ip_set_netmask6(prefix)[1];
-       ip->ip6[2] &= ip_set_netmask6(prefix)[2];
-       ip->ip6[3] &= ip_set_netmask6(prefix)[3];
-}
-
 static inline void
 hash_netiface6_data_netmask(struct hash_netiface6_elem *elem, u8 cidr)
 {

diff --git a/net/netfilter/ipset/ip_set_hash_netport.c b/net/netfilter/ipset/ip_set_hash_netport.c
index 57b0550a0b0d531d7ddde131992c57fbf363b48f..cd1d3c1df72abcbcc30bc987f2649d493d268677 100644 (file)
--- a/net/netfilter/ipset/ip_set_hash_netport.c
+++ b/net/netfilter/ipset/ip_set_hash_netport.c
@@ -406,15 +406,6 @@ hash_netport6_data_zero_out(struct hash_netport6_elem *elem)
        elem->proto = 0;
 }
 
-static inline void
-ip6_netmask(union nf_inet_addr *ip, u8 prefix)
-{
-       ip->ip6[0] &= ip_set_netmask6(prefix)[0];
-       ip->ip6[1] &= ip_set_netmask6(prefix)[1];
-       ip->ip6[2] &= ip_set_netmask6(prefix)[2];
-       ip->ip6[3] &= ip_set_netmask6(prefix)[3];
-}
-
 static inline void
 hash_netport6_data_netmask(struct hash_netport6_elem *elem, u8 cidr)
 {