summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'kernel')
-rw-r--r--kernel/Kbuild4
-rw-r--r--kernel/include/linux/jhash.h (renamed from kernel/include/linux/netfilter/ipset/jhash.h)0
-rw-r--r--kernel/include/linux/netfilter/ipset/ip_set_ahash.h2
-rw-r--r--kernel/ip_set_hash_ip.c2
-rw-r--r--kernel/ip_set_hash_ipport.c2
-rw-r--r--kernel/ip_set_hash_ipportip.c2
-rw-r--r--kernel/ip_set_hash_ipportnet.c2
-rw-r--r--kernel/ip_set_hash_net.c2
-rw-r--r--kernel/ip_set_hash_netport.c2
9 files changed, 9 insertions, 9 deletions
diff --git a/kernel/Kbuild b/kernel/Kbuild
index fec90be..8713c5b 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
index 72ca901..72ca901 100644
--- a/kernel/include/linux/netfilter/ipset/jhash.h
+++ b/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 b7029e1..2975041 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 c5b73dd..1b19b62 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 9f0c130..1f60450 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 84a4a41..556cc98 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 5c857c4..d6ff09f 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 6096830..1ad1de7 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 b2e1cca..a58da7c 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>