summaryrefslogtreecommitdiffstats
path: root/kernel/include/linux/netfilter
diff options
context:
space:
mode:
authorJozsef Kadlecsik <kadlec@blackhole.kfki.hu>2010-12-08 16:57:20 +0100
committerJozsef Kadlecsik <kadlec@blackhole.kfki.hu>2010-12-08 16:57:20 +0100
commit4150bd9b04e91e6e5b24b918f5d1c4c338a0755c (patch)
tree7f03a99c8daa418d17257aba949b249d5fd873a0 /kernel/include/linux/netfilter
parentad75e5387cb0b89f26e8950b8947b17293b82a43 (diff)
Strip off ip_set_ prefix from non-ipset specific header files.
Diffstat (limited to 'kernel/include/linux/netfilter')
-rw-r--r--kernel/include/linux/netfilter/ipset/ip_set_chash.h4
-rw-r--r--kernel/include/linux/netfilter/ipset/jhash.h (renamed from kernel/include/linux/netfilter/ipset/ip_set_jhash.h)0
-rw-r--r--kernel/include/linux/netfilter/ipset/slist.h (renamed from kernel/include/linux/netfilter/ipset/ip_set_slist.h)0
3 files changed, 2 insertions, 2 deletions
diff --git a/kernel/include/linux/netfilter/ipset/ip_set_chash.h b/kernel/include/linux/netfilter/ipset/ip_set_chash.h
index cd5e2f5..04955ef 100644
--- 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
index 72ca901..72ca901 100644
--- a/kernel/include/linux/netfilter/ipset/ip_set_jhash.h
+++ b/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
index e472e43..e472e43 100644
--- a/kernel/include/linux/netfilter/ipset/ip_set_slist.h
+++ b/kernel/include/linux/netfilter/ipset/slist.h