summaryrefslogtreecommitdiffstats
path: root/kernel/include
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/include')
-rw-r--r--kernel/include/linux/netfilter/ipset/ip_set.h (renamed from kernel/include/linux/netfilter/ip_set.h)0
-rw-r--r--kernel/include/linux/netfilter/ipset/ip_set_bitmap.h (renamed from kernel/include/linux/netfilter/ip_set_bitmap.h)0
-rw-r--r--kernel/include/linux/netfilter/ipset/ip_set_chash.h (renamed from kernel/include/linux/netfilter/ip_set_chash.h)6
-rw-r--r--kernel/include/linux/netfilter/ipset/ip_set_getport.h (renamed from kernel/include/linux/netfilter/ip_set_getport.h)0
-rw-r--r--kernel/include/linux/netfilter/ipset/ip_set_hash.h (renamed from kernel/include/linux/netfilter/ip_set_hash.h)0
-rw-r--r--kernel/include/linux/netfilter/ipset/ip_set_jhash.h (renamed from kernel/include/linux/netfilter/ip_set_jhash.h)0
-rw-r--r--kernel/include/linux/netfilter/ipset/ip_set_kernel.h (renamed from kernel/include/linux/netfilter/ip_set_kernel.h)0
-rw-r--r--kernel/include/linux/netfilter/ipset/ip_set_list.h (renamed from kernel/include/linux/netfilter/ip_set_list.h)0
-rw-r--r--kernel/include/linux/netfilter/ipset/ip_set_slist.h (renamed from kernel/include/linux/netfilter/ip_set_slist.h)0
-rw-r--r--kernel/include/linux/netfilter/ipset/ip_set_timeout.h (renamed from kernel/include/linux/netfilter/ip_set_timeout.h)0
-rw-r--r--kernel/include/linux/netfilter/xt_set.h2
11 files changed, 4 insertions, 4 deletions
diff --git a/kernel/include/linux/netfilter/ip_set.h b/kernel/include/linux/netfilter/ipset/ip_set.h
index 1e18b14..1e18b14 100644
--- a/kernel/include/linux/netfilter/ip_set.h
+++ b/kernel/include/linux/netfilter/ipset/ip_set.h
diff --git a/kernel/include/linux/netfilter/ip_set_bitmap.h b/kernel/include/linux/netfilter/ipset/ip_set_bitmap.h
index 61a9e87..61a9e87 100644
--- a/kernel/include/linux/netfilter/ip_set_bitmap.h
+++ b/kernel/include/linux/netfilter/ipset/ip_set_bitmap.h
diff --git a/kernel/include/linux/netfilter/ip_set_chash.h b/kernel/include/linux/netfilter/ipset/ip_set_chash.h
index 138e94d..cd5e2f5 100644
--- a/kernel/include/linux/netfilter/ip_set_chash.h
+++ b/kernel/include/linux/netfilter/ipset/ip_set_chash.h
@@ -1,9 +1,9 @@
#ifndef _IP_SET_CHASH_H
#define _IP_SET_CHASH_H
-#include <linux/netfilter/ip_set_jhash.h>
-#include <linux/netfilter/ip_set_slist.h>
-#include <linux/netfilter/ip_set_timeout.h>
+#include <linux/netfilter/ipset/ip_set_jhash.h>
+#include <linux/netfilter/ipset/ip_set_slist.h>
+#include <linux/netfilter/ipset/ip_set_timeout.h>
/* Cacheline friendly hash with resizing when linear searching becomes too
* long. Internally jhash is used with the assumption that the size of the
diff --git a/kernel/include/linux/netfilter/ip_set_getport.h b/kernel/include/linux/netfilter/ipset/ip_set_getport.h
index 1597fa9..1597fa9 100644
--- a/kernel/include/linux/netfilter/ip_set_getport.h
+++ b/kernel/include/linux/netfilter/ipset/ip_set_getport.h
diff --git a/kernel/include/linux/netfilter/ip_set_hash.h b/kernel/include/linux/netfilter/ipset/ip_set_hash.h
index b86f15c..b86f15c 100644
--- a/kernel/include/linux/netfilter/ip_set_hash.h
+++ b/kernel/include/linux/netfilter/ipset/ip_set_hash.h
diff --git a/kernel/include/linux/netfilter/ip_set_jhash.h b/kernel/include/linux/netfilter/ipset/ip_set_jhash.h
index d5e0d6d..d5e0d6d 100644
--- a/kernel/include/linux/netfilter/ip_set_jhash.h
+++ b/kernel/include/linux/netfilter/ipset/ip_set_jhash.h
diff --git a/kernel/include/linux/netfilter/ip_set_kernel.h b/kernel/include/linux/netfilter/ipset/ip_set_kernel.h
index d770589..d770589 100644
--- a/kernel/include/linux/netfilter/ip_set_kernel.h
+++ b/kernel/include/linux/netfilter/ipset/ip_set_kernel.h
diff --git a/kernel/include/linux/netfilter/ip_set_list.h b/kernel/include/linux/netfilter/ipset/ip_set_list.h
index 40a63f3..40a63f3 100644
--- a/kernel/include/linux/netfilter/ip_set_list.h
+++ b/kernel/include/linux/netfilter/ipset/ip_set_list.h
diff --git a/kernel/include/linux/netfilter/ip_set_slist.h b/kernel/include/linux/netfilter/ipset/ip_set_slist.h
index e472e43..e472e43 100644
--- a/kernel/include/linux/netfilter/ip_set_slist.h
+++ b/kernel/include/linux/netfilter/ipset/ip_set_slist.h
diff --git a/kernel/include/linux/netfilter/ip_set_timeout.h b/kernel/include/linux/netfilter/ipset/ip_set_timeout.h
index 519d84f..519d84f 100644
--- a/kernel/include/linux/netfilter/ip_set_timeout.h
+++ b/kernel/include/linux/netfilter/ipset/ip_set_timeout.h
diff --git a/kernel/include/linux/netfilter/xt_set.h b/kernel/include/linux/netfilter/xt_set.h
index 949fa59..c6084df 100644
--- a/kernel/include/linux/netfilter/xt_set.h
+++ b/kernel/include/linux/netfilter/xt_set.h
@@ -1,7 +1,7 @@
#ifndef _XT_SET_H
#define _XT_SET_H
-#include <linux/netfilter/ip_set.h>
+#include <linux/netfilter/ipset/ip_set.h>
/* Revision 0 interface: backward compatible with netfilter/iptables */