summaryrefslogtreecommitdiffstats
path: root/kernel/include
diff options
context:
space:
mode:
authorJozsef Kadlecsik <kadlec@blackhole.kfki.hu>2011-01-13 22:01:51 +0100
committerJozsef Kadlecsik <kadlec@blackhole.kfki.hu>2011-01-13 22:01:51 +0100
commit692fd7db42487f4c173cfb2743e40baee160b359 (patch)
treecdbddf1796647ffb3e1c634a0ac387e01e7620f5 /kernel/include
parent9c4b9a1ca942ae933fe4693a25e2ddea873cc341 (diff)
Use jhash.h accepted in kernel, with backward compatibility.
Diffstat (limited to 'kernel/include')
-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
2 files changed, 1 insertions, 1 deletions
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