From: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Date: Tue, 7 Dec 2010 16:46:40 +0000 (+0100)
Subject: Create include/linux/netfilter/ipset/ directory
X-Git-Tag: v5.0~29
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4902415c1e95003068343d69206887be0e202615;p=thirdparty%2Fipset.git

Create include/linux/netfilter/ipset/ directory

Separate the ipset header files from netfilter header files.
---

diff --git a/kernel/include/linux/netfilter/ip_set.h b/kernel/include/linux/netfilter/ipset/ip_set.h
similarity index 100%
rename from kernel/include/linux/netfilter/ip_set.h
rename to kernel/include/linux/netfilter/ipset/ip_set.h
diff --git a/kernel/include/linux/netfilter/ip_set_bitmap.h b/kernel/include/linux/netfilter/ipset/ip_set_bitmap.h
similarity index 100%
rename from kernel/include/linux/netfilter/ip_set_bitmap.h
rename to kernel/include/linux/netfilter/ipset/ip_set_bitmap.h
diff --git a/kernel/include/linux/netfilter/ip_set_chash.h b/kernel/include/linux/netfilter/ipset/ip_set_chash.h
similarity index 99%
rename from kernel/include/linux/netfilter/ip_set_chash.h
rename to kernel/include/linux/netfilter/ipset/ip_set_chash.h
index 138e94d0..cd5e2f5f 100644
--- a/kernel/include/linux/netfilter/ip_set_chash.h
+++ b/kernel/include/linux/netfilter/ipset/ip_set_chash.h
@@ -1,9 +1,9 @@
 #ifndef _IP_SET_CHASH_H
 #define _IP_SET_CHASH_H
 
-#include <linux/netfilter/ip_set_jhash.h>
-#include <linux/netfilter/ip_set_slist.h>
-#include <linux/netfilter/ip_set_timeout.h>
+#include <linux/netfilter/ipset/ip_set_jhash.h>
+#include <linux/netfilter/ipset/ip_set_slist.h>
+#include <linux/netfilter/ipset/ip_set_timeout.h>
 
 /* Cacheline friendly hash with resizing when linear searching becomes too
  * long. Internally jhash is used with the assumption that the size of the
diff --git a/kernel/include/linux/netfilter/ip_set_getport.h b/kernel/include/linux/netfilter/ipset/ip_set_getport.h
similarity index 100%
rename from kernel/include/linux/netfilter/ip_set_getport.h
rename to kernel/include/linux/netfilter/ipset/ip_set_getport.h
diff --git a/kernel/include/linux/netfilter/ip_set_hash.h b/kernel/include/linux/netfilter/ipset/ip_set_hash.h
similarity index 100%
rename from kernel/include/linux/netfilter/ip_set_hash.h
rename to kernel/include/linux/netfilter/ipset/ip_set_hash.h
diff --git a/kernel/include/linux/netfilter/ip_set_jhash.h b/kernel/include/linux/netfilter/ipset/ip_set_jhash.h
similarity index 100%
rename from kernel/include/linux/netfilter/ip_set_jhash.h
rename to kernel/include/linux/netfilter/ipset/ip_set_jhash.h
diff --git a/kernel/include/linux/netfilter/ip_set_kernel.h b/kernel/include/linux/netfilter/ipset/ip_set_kernel.h
similarity index 100%
rename from kernel/include/linux/netfilter/ip_set_kernel.h
rename to kernel/include/linux/netfilter/ipset/ip_set_kernel.h
diff --git a/kernel/include/linux/netfilter/ip_set_list.h b/kernel/include/linux/netfilter/ipset/ip_set_list.h
similarity index 100%
rename from kernel/include/linux/netfilter/ip_set_list.h
rename to kernel/include/linux/netfilter/ipset/ip_set_list.h
diff --git a/kernel/include/linux/netfilter/ip_set_slist.h b/kernel/include/linux/netfilter/ipset/ip_set_slist.h
similarity index 100%
rename from kernel/include/linux/netfilter/ip_set_slist.h
rename to kernel/include/linux/netfilter/ipset/ip_set_slist.h
diff --git a/kernel/include/linux/netfilter/ip_set_timeout.h b/kernel/include/linux/netfilter/ipset/ip_set_timeout.h
similarity index 100%
rename from kernel/include/linux/netfilter/ip_set_timeout.h
rename to kernel/include/linux/netfilter/ipset/ip_set_timeout.h
diff --git a/kernel/include/linux/netfilter/xt_set.h b/kernel/include/linux/netfilter/xt_set.h
index 949fa59a..c6084dfd 100644
--- a/kernel/include/linux/netfilter/xt_set.h
+++ b/kernel/include/linux/netfilter/xt_set.h
@@ -1,7 +1,7 @@
 #ifndef _XT_SET_H
 #define _XT_SET_H
 
-#include <linux/netfilter/ip_set.h>
+#include <linux/netfilter/ipset/ip_set.h>
 
 /* Revision 0 interface: backward compatible with netfilter/iptables */
 
diff --git a/kernel/ip_set.c b/kernel/ip_set.c
index 1e64845d..b8cfd81e 100644
--- a/kernel/ip_set.c
+++ b/kernel/ip_set.c
@@ -9,7 +9,7 @@
 
 /* Kernel module for IP set management */
 
-#include <linux/netfilter/ip_set_kernel.h>
+#include <linux/netfilter/ipset/ip_set_kernel.h>
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
@@ -22,7 +22,7 @@
 
 #include <linux/netfilter.h>
 #include <linux/netfilter/nfnetlink.h>
-#include <linux/netfilter/ip_set.h>
+#include <linux/netfilter/ipset/ip_set.h>
 
 static struct list_head ip_set_type_list;	/* all registered set types */
 static DEFINE_MUTEX(ip_set_type_mutex);		/* protects ip_set_type_list */
diff --git a/kernel/ip_set_bitmap_ip.c b/kernel/ip_set_bitmap_ip.c
index 76a358a2..054c717f 100644
--- a/kernel/ip_set_bitmap_ip.c
+++ b/kernel/ip_set_bitmap_ip.c
@@ -9,7 +9,7 @@
 
 /* Kernel module implementing an IP set type: the bitmap:ip type */
 
-#include <linux/netfilter/ip_set_kernel.h>
+#include <linux/netfilter/ipset/ip_set_kernel.h>
 #include <linux/module.h>
 #include <linux/ip.h>
 #include <linux/skbuff.h>
@@ -23,10 +23,10 @@
 #include <net/netlink.h>
 #include <net/tcp.h>
 
-#include <linux/netfilter/ip_set.h>
-#include <linux/netfilter/ip_set_bitmap.h>
+#include <linux/netfilter/ipset/ip_set.h>
+#include <linux/netfilter/ipset/ip_set_bitmap.h>
 #define IP_SET_BITMAP_TIMEOUT
-#include <linux/netfilter/ip_set_timeout.h>
+#include <linux/netfilter/ipset/ip_set_timeout.h>
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>");
diff --git a/kernel/ip_set_bitmap_ipmac.c b/kernel/ip_set_bitmap_ipmac.c
index e8867343..c8386583 100644
--- a/kernel/ip_set_bitmap_ipmac.c
+++ b/kernel/ip_set_bitmap_ipmac.c
@@ -10,7 +10,7 @@
 
 /* Kernel module implementing an IP set type: the bitmap:ip,mac type */
 
-#include <linux/netfilter/ip_set_kernel.h>
+#include <linux/netfilter/ipset/ip_set_kernel.h>
 #include <linux/module.h>
 #include <linux/ip.h>
 #include <linux/etherdevice.h>
@@ -25,9 +25,9 @@
 #include <linux/timer.h>
 #include <net/netlink.h>
 
-#include <linux/netfilter/ip_set.h>
-#include <linux/netfilter/ip_set_timeout.h>
-#include <linux/netfilter/ip_set_bitmap.h>
+#include <linux/netfilter/ipset/ip_set.h>
+#include <linux/netfilter/ipset/ip_set_timeout.h>
+#include <linux/netfilter/ipset/ip_set_bitmap.h>
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>");
diff --git a/kernel/ip_set_bitmap_port.c b/kernel/ip_set_bitmap_port.c
index 5710f634..a430c0b5 100644
--- a/kernel/ip_set_bitmap_port.c
+++ b/kernel/ip_set_bitmap_port.c
@@ -7,7 +7,7 @@
 
 /* Kernel module implementing an IP set type: the bitmap:port type */
 
-#include <linux/netfilter/ip_set_kernel.h>
+#include <linux/netfilter/ipset/ip_set_kernel.h>
 #include <linux/module.h>
 #include <linux/ip.h>
 #include <linux/tcp.h>
@@ -22,11 +22,11 @@
 #include <linux/timer.h>
 #include <net/netlink.h>
 
-#include <linux/netfilter/ip_set.h>
-#include <linux/netfilter/ip_set_bitmap.h>
-#include <linux/netfilter/ip_set_getport.h>
+#include <linux/netfilter/ipset/ip_set.h>
+#include <linux/netfilter/ipset/ip_set_bitmap.h>
+#include <linux/netfilter/ipset/ip_set_getport.h>
 #define IP_SET_BITMAP_TIMEOUT
-#include <linux/netfilter/ip_set_timeout.h>
+#include <linux/netfilter/ipset/ip_set_timeout.h>
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>");
diff --git a/kernel/ip_set_hash_ip.c b/kernel/ip_set_hash_ip.c
index 7ae46aa2..d5ba155a 100644
--- a/kernel/ip_set_hash_ip.c
+++ b/kernel/ip_set_hash_ip.c
@@ -7,8 +7,8 @@
 
 /* Kernel module implementing an IP set type: the hash:ip type */
 
-#include <linux/netfilter/ip_set_kernel.h>
-#include <linux/netfilter/ip_set_jhash.h>
+#include <linux/netfilter/ipset/ip_set_kernel.h>
+#include <linux/netfilter/ipset/ip_set_jhash.h>
 #include <linux/module.h>
 #include <linux/ip.h>
 #include <linux/skbuff.h>
@@ -23,9 +23,9 @@
 #include <net/tcp.h>
 
 #include <linux/netfilter.h>
-#include <linux/netfilter/ip_set.h>
-#include <linux/netfilter/ip_set_timeout.h>
-#include <linux/netfilter/ip_set_hash.h>
+#include <linux/netfilter/ipset/ip_set.h>
+#include <linux/netfilter/ipset/ip_set_timeout.h>
+#include <linux/netfilter/ipset/ip_set_hash.h>
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>");
@@ -115,7 +115,7 @@ nla_put_failure:
 #define IP_SET_HASH_WITH_NETMASK
 #define PF		4
 #define HOST_MASK	32
-#include <linux/netfilter/ip_set_chash.h>
+#include <linux/netfilter/ipset/ip_set_chash.h>
 
 static int
 hash_ip4_kadt(struct ip_set *set, const struct sk_buff *skb,
@@ -307,7 +307,7 @@ nla_put_failure:
 
 #define PF		6
 #define HOST_MASK	128
-#include <linux/netfilter/ip_set_chash.h>
+#include <linux/netfilter/ipset/ip_set_chash.h>
 
 static int
 hash_ip6_kadt(struct ip_set *set, const struct sk_buff *skb,
diff --git a/kernel/ip_set_hash_ipport.c b/kernel/ip_set_hash_ipport.c
index fb6888e9..92851c72 100644
--- a/kernel/ip_set_hash_ipport.c
+++ b/kernel/ip_set_hash_ipport.c
@@ -7,8 +7,8 @@
 
 /* Kernel module implementing an IP set type: the hash:ip,port type */
 
-#include <linux/netfilter/ip_set_kernel.h>
-#include <linux/netfilter/ip_set_jhash.h>
+#include <linux/netfilter/ipset/ip_set_kernel.h>
+#include <linux/netfilter/ipset/ip_set_jhash.h>
 #include <linux/module.h>
 #include <linux/ip.h>
 #include <linux/skbuff.h>
@@ -22,10 +22,10 @@
 #include <net/netlink.h>
 
 #include <linux/netfilter.h>
-#include <linux/netfilter/ip_set.h>
-#include <linux/netfilter/ip_set_timeout.h>
-#include <linux/netfilter/ip_set_getport.h>
-#include <linux/netfilter/ip_set_hash.h>
+#include <linux/netfilter/ipset/ip_set.h>
+#include <linux/netfilter/ipset/ip_set_timeout.h>
+#include <linux/netfilter/ipset/ip_set_getport.h>
+#include <linux/netfilter/ipset/ip_set_hash.h>
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>");
@@ -133,7 +133,7 @@ nla_put_failure:
 
 #define PF		4
 #define HOST_MASK	32
-#include <linux/netfilter/ip_set_chash.h>
+#include <linux/netfilter/ipset/ip_set_chash.h>
 
 static int
 hash_ipport4_kadt(struct ip_set *set, const struct sk_buff *skb,
@@ -322,7 +322,7 @@ nla_put_failure:
 
 #define PF		6
 #define HOST_MASK	128
-#include <linux/netfilter/ip_set_chash.h>
+#include <linux/netfilter/ipset/ip_set_chash.h>
 
 static int
 hash_ipport6_kadt(struct ip_set *set, const struct sk_buff *skb,
diff --git a/kernel/ip_set_hash_ipportip.c b/kernel/ip_set_hash_ipportip.c
index a82a5ca5..af91dc19 100644
--- a/kernel/ip_set_hash_ipportip.c
+++ b/kernel/ip_set_hash_ipportip.c
@@ -7,8 +7,8 @@
 
 /* Kernel module implementing an IP set type: the hash:ip,port,ip type */
 
-#include <linux/netfilter/ip_set_kernel.h>
-#include <linux/netfilter/ip_set_jhash.h>
+#include <linux/netfilter/ipset/ip_set_kernel.h>
+#include <linux/netfilter/ipset/ip_set_jhash.h>
 #include <linux/module.h>
 #include <linux/ip.h>
 #include <linux/skbuff.h>
@@ -22,10 +22,10 @@
 #include <net/netlink.h>
 
 #include <linux/netfilter.h>
-#include <linux/netfilter/ip_set.h>
-#include <linux/netfilter/ip_set_timeout.h>
-#include <linux/netfilter/ip_set_getport.h>
-#include <linux/netfilter/ip_set_hash.h>
+#include <linux/netfilter/ipset/ip_set.h>
+#include <linux/netfilter/ipset/ip_set_timeout.h>
+#include <linux/netfilter/ipset/ip_set_getport.h>
+#include <linux/netfilter/ipset/ip_set_hash.h>
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>");
@@ -138,7 +138,7 @@ nla_put_failure:
 
 #define PF		4
 #define HOST_MASK	32
-#include <linux/netfilter/ip_set_chash.h>
+#include <linux/netfilter/ipset/ip_set_chash.h>
 
 static int
 hash_ipportip4_kadt(struct ip_set *set, const struct sk_buff *skb,
@@ -338,7 +338,7 @@ nla_put_failure:
 
 #define PF		6
 #define HOST_MASK	128
-#include <linux/netfilter/ip_set_chash.h>
+#include <linux/netfilter/ipset/ip_set_chash.h>
 
 static int
 hash_ipportip6_kadt(struct ip_set *set, const struct sk_buff *skb,
diff --git a/kernel/ip_set_hash_ipportnet.c b/kernel/ip_set_hash_ipportnet.c
index 73af21ec..f9c31922 100644
--- a/kernel/ip_set_hash_ipportnet.c
+++ b/kernel/ip_set_hash_ipportnet.c
@@ -7,8 +7,8 @@
 
 /* Kernel module implementing an IP set type: the hash:ip,port,net type */
 
-#include <linux/netfilter/ip_set_kernel.h>
-#include <linux/netfilter/ip_set_jhash.h>
+#include <linux/netfilter/ipset/ip_set_kernel.h>
+#include <linux/netfilter/ipset/ip_set_jhash.h>
 #include <linux/module.h>
 #include <linux/ip.h>
 #include <linux/skbuff.h>
@@ -22,10 +22,10 @@
 #include <net/netlink.h>
 
 #include <linux/netfilter.h>
-#include <linux/netfilter/ip_set.h>
-#include <linux/netfilter/ip_set_timeout.h>
-#include <linux/netfilter/ip_set_getport.h>
-#include <linux/netfilter/ip_set_hash.h>
+#include <linux/netfilter/ipset/ip_set.h>
+#include <linux/netfilter/ipset/ip_set_timeout.h>
+#include <linux/netfilter/ipset/ip_set_getport.h>
+#include <linux/netfilter/ipset/ip_set_hash.h>
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>");
@@ -151,7 +151,7 @@ nla_put_failure:
 
 #define PF		4
 #define HOST_MASK	32
-#include <linux/netfilter/ip_set_chash.h>
+#include <linux/netfilter/ipset/ip_set_chash.h>
 
 static int
 hash_ipportnet4_kadt(struct ip_set *set, const struct sk_buff *skb,
@@ -386,7 +386,7 @@ nla_put_failure:
 
 #define PF		6
 #define HOST_MASK	128
-#include <linux/netfilter/ip_set_chash.h>
+#include <linux/netfilter/ipset/ip_set_chash.h>
 
 static int
 hash_ipportnet6_kadt(struct ip_set *set, const struct sk_buff *skb,
diff --git a/kernel/ip_set_hash_net.c b/kernel/ip_set_hash_net.c
index b713d2a7..988a7bbb 100644
--- a/kernel/ip_set_hash_net.c
+++ b/kernel/ip_set_hash_net.c
@@ -7,8 +7,8 @@
 
 /* Kernel module implementing an IP set type: the hash:net type */
 
-#include <linux/netfilter/ip_set_kernel.h>
-#include <linux/netfilter/ip_set_jhash.h>
+#include <linux/netfilter/ipset/ip_set_kernel.h>
+#include <linux/netfilter/ipset/ip_set_jhash.h>
 #include <linux/module.h>
 #include <linux/ip.h>
 #include <linux/skbuff.h>
@@ -22,9 +22,9 @@
 #include <net/netlink.h>
 
 #include <linux/netfilter.h>
-#include <linux/netfilter/ip_set.h>
-#include <linux/netfilter/ip_set_timeout.h>
-#include <linux/netfilter/ip_set_hash.h>
+#include <linux/netfilter/ipset/ip_set.h>
+#include <linux/netfilter/ipset/ip_set_timeout.h>
+#include <linux/netfilter/ipset/ip_set_hash.h>
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>");
@@ -134,7 +134,7 @@ nla_put_failure:
 
 #define PF		4
 #define HOST_MASK	32
-#include <linux/netfilter/ip_set_chash.h>
+#include <linux/netfilter/ipset/ip_set_chash.h>
 
 static int
 hash_net4_kadt(struct ip_set *set, const struct sk_buff *skb,
@@ -319,7 +319,7 @@ nla_put_failure:
 
 #define PF		6
 #define HOST_MASK	128
-#include <linux/netfilter/ip_set_chash.h>
+#include <linux/netfilter/ipset/ip_set_chash.h>
 
 static int
 hash_net6_kadt(struct ip_set *set, const struct sk_buff *skb,
diff --git a/kernel/ip_set_hash_netport.c b/kernel/ip_set_hash_netport.c
index bc59e9d0..da81d6ef 100644
--- a/kernel/ip_set_hash_netport.c
+++ b/kernel/ip_set_hash_netport.c
@@ -7,8 +7,8 @@
 
 /* Kernel module implementing an IP set type: the hash:net,port type */
 
-#include <linux/netfilter/ip_set_kernel.h>
-#include <linux/netfilter/ip_set_jhash.h>
+#include <linux/netfilter/ipset/ip_set_kernel.h>
+#include <linux/netfilter/ipset/ip_set_jhash.h>
 #include <linux/module.h>
 #include <linux/ip.h>
 #include <linux/skbuff.h>
@@ -22,10 +22,10 @@
 #include <net/netlink.h>
 
 #include <linux/netfilter.h>
-#include <linux/netfilter/ip_set.h>
-#include <linux/netfilter/ip_set_timeout.h>
-#include <linux/netfilter/ip_set_getport.h>
-#include <linux/netfilter/ip_set_hash.h>
+#include <linux/netfilter/ipset/ip_set.h>
+#include <linux/netfilter/ipset/ip_set_timeout.h>
+#include <linux/netfilter/ipset/ip_set_getport.h>
+#include <linux/netfilter/ipset/ip_set_hash.h>
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>");
@@ -148,7 +148,7 @@ nla_put_failure:
 
 #define PF		4
 #define HOST_MASK	32
-#include <linux/netfilter/ip_set_chash.h>
+#include <linux/netfilter/ipset/ip_set_chash.h>
 
 static int
 hash_netport4_kadt(struct ip_set *set, const struct sk_buff *skb,
@@ -370,7 +370,7 @@ nla_put_failure:
 
 #define PF		6
 #define HOST_MASK	128
-#include <linux/netfilter/ip_set_chash.h>
+#include <linux/netfilter/ipset/ip_set_chash.h>
 
 static int
 hash_netport6_kadt(struct ip_set *set, const struct sk_buff *skb,
diff --git a/kernel/ip_set_list_set.c b/kernel/ip_set_list_set.c
index 3b9ba123..fe4b4103 100644
--- a/kernel/ip_set_list_set.c
+++ b/kernel/ip_set_list_set.c
@@ -7,15 +7,15 @@
 
 /* Kernel module implementing an IP set type: the list:set type */
 
-#include <linux/netfilter/ip_set_kernel.h>
+#include <linux/netfilter/ipset/ip_set_kernel.h>
 #include <linux/module.h>
 #include <linux/ip.h>
 #include <linux/skbuff.h>
 #include <linux/errno.h>
 
-#include <linux/netfilter/ip_set.h>
-#include <linux/netfilter/ip_set_timeout.h>
-#include <linux/netfilter/ip_set_list.h>
+#include <linux/netfilter/ipset/ip_set.h>
+#include <linux/netfilter/ipset/ip_set_timeout.h>
+#include <linux/netfilter/ipset/ip_set_list.h>
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>");
diff --git a/update b/update
index 494485c3..58045540 100755
--- a/update
+++ b/update
@@ -6,4 +6,4 @@ awk "BEGIN { userspace=1 }
 /ifdef __KERNEL__/ { userspace = !userspace }
 { if (userspace == 1) print }
 END { print \"#endif /* __${NAME}_H */\" }" \
-	< kernel/include/linux/netfilter/$1 > include/libipset/linux_$1
+	< kernel/include/linux/netfilter/ipset/$1 > include/libipset/linux_$1