From: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Date: Wed, 8 Dec 2010 15:57:20 +0000 (+0100)
Subject: Strip off ip_set_ prefix from non-ipset specific header files.
X-Git-Tag: v5.0~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4150bd9b04e91e6e5b24b918f5d1c4c338a0755c;p=thirdparty%2Fipset.git

Strip off ip_set_ prefix from non-ipset specific header files.
---

diff --git a/kernel/include/linux/netfilter/ipset/ip_set_chash.h b/kernel/include/linux/netfilter/ipset/ip_set_chash.h
index cd5e2f5f..04955ef0 100644
--- a/kernel/include/linux/netfilter/ipset/ip_set_chash.h
+++ b/kernel/include/linux/netfilter/ipset/ip_set_chash.h
@@ -1,8 +1,8 @@
 #ifndef _IP_SET_CHASH_H
 #define _IP_SET_CHASH_H
 
-#include <linux/netfilter/ipset/ip_set_jhash.h>
-#include <linux/netfilter/ipset/ip_set_slist.h>
+#include <linux/netfilter/ipset/jhash.h>
+#include <linux/netfilter/ipset/slist.h>
 #include <linux/netfilter/ipset/ip_set_timeout.h>
 
 /* Cacheline friendly hash with resizing when linear searching becomes too
diff --git a/kernel/include/linux/netfilter/ipset/ip_set_jhash.h b/kernel/include/linux/netfilter/ipset/jhash.h
similarity index 100%
rename from kernel/include/linux/netfilter/ipset/ip_set_jhash.h
rename to kernel/include/linux/netfilter/ipset/jhash.h
diff --git a/kernel/include/linux/netfilter/ipset/ip_set_slist.h b/kernel/include/linux/netfilter/ipset/slist.h
similarity index 100%
rename from kernel/include/linux/netfilter/ipset/ip_set_slist.h
rename to kernel/include/linux/netfilter/ipset/slist.h
diff --git a/kernel/ip_set_hash_ip.c b/kernel/ip_set_hash_ip.c
index d5ba155a..372a8b85 100644
--- a/kernel/ip_set_hash_ip.c
+++ b/kernel/ip_set_hash_ip.c
@@ -8,7 +8,7 @@
 /* Kernel module implementing an IP set type: the hash:ip type */
 
 #include <linux/netfilter/ipset/ip_set_kernel.h>
-#include <linux/netfilter/ipset/ip_set_jhash.h>
+#include <linux/netfilter/ipset/jhash.h>
 #include <linux/module.h>
 #include <linux/ip.h>
 #include <linux/skbuff.h>
diff --git a/kernel/ip_set_hash_ipport.c b/kernel/ip_set_hash_ipport.c
index 92851c72..22397fbb 100644
--- a/kernel/ip_set_hash_ipport.c
+++ b/kernel/ip_set_hash_ipport.c
@@ -8,7 +8,7 @@
 /* Kernel module implementing an IP set type: the hash:ip,port type */
 
 #include <linux/netfilter/ipset/ip_set_kernel.h>
-#include <linux/netfilter/ipset/ip_set_jhash.h>
+#include <linux/netfilter/ipset/jhash.h>
 #include <linux/module.h>
 #include <linux/ip.h>
 #include <linux/skbuff.h>
diff --git a/kernel/ip_set_hash_ipportip.c b/kernel/ip_set_hash_ipportip.c
index af91dc19..bad0337d 100644
--- a/kernel/ip_set_hash_ipportip.c
+++ b/kernel/ip_set_hash_ipportip.c
@@ -8,7 +8,7 @@
 /* Kernel module implementing an IP set type: the hash:ip,port,ip type */
 
 #include <linux/netfilter/ipset/ip_set_kernel.h>
-#include <linux/netfilter/ipset/ip_set_jhash.h>
+#include <linux/netfilter/ipset/jhash.h>
 #include <linux/module.h>
 #include <linux/ip.h>
 #include <linux/skbuff.h>
diff --git a/kernel/ip_set_hash_ipportnet.c b/kernel/ip_set_hash_ipportnet.c
index f9c31922..c078dc49 100644
--- a/kernel/ip_set_hash_ipportnet.c
+++ b/kernel/ip_set_hash_ipportnet.c
@@ -8,7 +8,7 @@
 /* Kernel module implementing an IP set type: the hash:ip,port,net type */
 
 #include <linux/netfilter/ipset/ip_set_kernel.h>
-#include <linux/netfilter/ipset/ip_set_jhash.h>
+#include <linux/netfilter/ipset/jhash.h>
 #include <linux/module.h>
 #include <linux/ip.h>
 #include <linux/skbuff.h>
diff --git a/kernel/ip_set_hash_net.c b/kernel/ip_set_hash_net.c
index 988a7bbb..d2527609 100644
--- a/kernel/ip_set_hash_net.c
+++ b/kernel/ip_set_hash_net.c
@@ -8,7 +8,7 @@
 /* Kernel module implementing an IP set type: the hash:net type */
 
 #include <linux/netfilter/ipset/ip_set_kernel.h>
-#include <linux/netfilter/ipset/ip_set_jhash.h>
+#include <linux/netfilter/ipset/jhash.h>
 #include <linux/module.h>
 #include <linux/ip.h>
 #include <linux/skbuff.h>
diff --git a/kernel/ip_set_hash_netport.c b/kernel/ip_set_hash_netport.c
index da81d6ef..d95b3c77 100644
--- a/kernel/ip_set_hash_netport.c
+++ b/kernel/ip_set_hash_netport.c
@@ -8,7 +8,7 @@
 /* Kernel module implementing an IP set type: the hash:net,port type */
 
 #include <linux/netfilter/ipset/ip_set_kernel.h>
-#include <linux/netfilter/ipset/ip_set_jhash.h>
+#include <linux/netfilter/ipset/jhash.h>
 #include <linux/module.h>
 #include <linux/ip.h>
 #include <linux/skbuff.h>