Use jhash.h accepted in kernel, with backward compatibility.

diff --git a/kernel/Kbuild b/kernel/Kbuild
index fec90bee35dd98efd17ee0301bd7c0576a20a6ad..8713c5b098d4a63bf4d567bb717b20e5a3431b5a 100644 (file)
--- a/kernel/Kbuild
+++ b/kernel/Kbuild
@@ -1,5 +1,5 @@
-EXTRA_CFLAGS := -I$(M)/include \
-       -DCONFIG_IP_SET_MAX=$(IP_SET_MAX)
+NOSTDINC_FLAGS += -I$(M)/include
+EXTRA_CFLAGS := -DCONFIG_IP_SET_MAX=$(IP_SET_MAX)
 
 ip_set-y := ip_set_core.o pfxlen.o
 obj-m += ip_set.o xt_set.o

diff --git a/kernel/include/linux/netfilter/ipset/jhash.h b/kernel/include/linux/jhash.h
similarity index 100%
rename from kernel/include/linux/netfilter/ipset/jhash.h
rename to kernel/include/linux/jhash.h

diff --git a/kernel/include/linux/netfilter/ipset/ip_set_ahash.h b/kernel/include/linux/netfilter/ipset/ip_set_ahash.h
index b7029e13b513ddf88dd08b2a3ac4066b2e85b02a..29750412a2279060a276a67825829f65010a0444 100644 (file)
--- a/kernel/include/linux/netfilter/ipset/ip_set_ahash.h
+++ b/kernel/include/linux/netfilter/ipset/ip_set_ahash.h
@@ -2,7 +2,7 @@
 #define _IP_SET_AHASH_H
 
 #include <linux/rcupdate.h>
-#include <linux/netfilter/ipset/jhash.h>
+#include <linux/jhash.h>
 #include <linux/netfilter/ipset/ip_set_timeout.h>
 
 /* Hashing which uses arrays to resolve clashing. The hash table is resized

diff --git a/kernel/ip_set_hash_ip.c b/kernel/ip_set_hash_ip.c
index c5b73ddc5015932c10312b4a0d9c4b1c180bb15e..1b19b62b825d77d82aa9b545ab573a3f4c30990e 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/jhash.h>
+#include <linux/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 9f0c13039b8fe53e05daf4b0f921865897be98dc..1f60450f51e63e1e314dc598e7318d9b94a31535 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/jhash.h>
+#include <linux/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 84a4a41c935abd581cf76e0c92d048080a963ebc..556cc9834c04c88f70af15c1e4d81b742c196d64 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/jhash.h>
+#include <linux/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 5c857c4afcfaf47b21277a493d5922e247000f28..d6ff09f44989d903bd96cdc35924c23b4140fa40 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/jhash.h>
+#include <linux/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 6096830f1b903310aba2387dbf953aa5d4d1e0dc..1ad1de795ab3a6101c0ef511cb5ecedae20e5997 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/jhash.h>
+#include <linux/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 b2e1ccad12c64995c0ab4f11540c127383a801f1..a58da7cf856ac253268acc110b71a57e3d819861 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/jhash.h>
+#include <linux/jhash.h>
 #include <linux/module.h>
 #include <linux/ip.h>
 #include <linux/skbuff.h>