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 cd5e2f5fc3c832d95eb9db18cf91a61fb3855a60..04955ef081a2fc5396d101b0927c7f0dd6f5f895 100644 (file)
--- 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 d5ba155a20cc541622ddfd0b88dbe8d79e3ea1d7..372a8b857cd6e40c33f4533141372f0ef2727432 100644 (file)
--- 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 92851c725429509ce4fa35819c6bd37f043b616d..22397fbb39ddfeadde93729f816745260b6041e1 100644 (file)
--- 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 af91dc19fc15bac5a63f3b0cbf0076f260491718..bad0337db5ff0adadf2c853d448cc02251328254 100644 (file)
--- 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 f9c3192256bacf11953e732208605176d1900fb6..c078dc497a7af4ba3db6c821d20f80e043a7842e 100644 (file)
--- 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 988a7bbb4a8828c8d27c24d5c43902b2da03b169..d252760976f350427376b1f77616081799df3107 100644 (file)
--- 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 da81d6ef8d70b9b03542a97491f16c787237c3bc..d95b3c77b8e96e1dd449cc05e2e0d8d22ff66cf6 100644 (file)
--- 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>