From: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Date: Thu, 13 Jan 2011 21:01:51 +0000 (+0100)
Subject: Use jhash.h accepted in kernel, with backward compatibility.
X-Git-Tag: v5.3~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=692fd7db42487f4c173cfb2743e40baee160b359;p=thirdparty%2Fipset.git

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

diff --git a/kernel/Kbuild b/kernel/Kbuild
index fec90bee..8713c5b0 100644
--- 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 b7029e13..29750412 100644
--- 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 c5b73ddc..1b19b62b 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/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 9f0c1303..1f60450f 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/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 84a4a41c..556cc983 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/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 5c857c4a..d6ff09f4 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/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 6096830f..1ad1de79 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/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 b2e1ccad..a58da7cf 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/jhash.h>
+#include <linux/jhash.h>
 #include <linux/module.h>
 #include <linux/ip.h>
 #include <linux/skbuff.h>