From 4902415c1e95003068343d69206887be0e202615 Mon Sep 17 00:00:00 2001
From: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Date: Tue, 7 Dec 2010 17:46:40 +0100
Subject: Create include/linux/netfilter/ipset/ directory

Separate the ipset header files from netfilter header files.
---
 kernel/ip_set_hash_ipportnet.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'kernel/ip_set_hash_ipportnet.c')

diff --git a/kernel/ip_set_hash_ipportnet.c b/kernel/ip_set_hash_ipportnet.c
index 73af21e..f9c3192 100644
--- a/kernel/ip_set_hash_ipportnet.c
+++ b/kernel/ip_set_hash_ipportnet.c
@@ -7,8 +7,8 @@
 
 /* Kernel module implementing an IP set type: the hash:ip,port,net type */
 
-#include <linux/netfilter/ip_set_kernel.h>
-#include <linux/netfilter/ip_set_jhash.h>
+#include <linux/netfilter/ipset/ip_set_kernel.h>
+#include <linux/netfilter/ipset/ip_set_jhash.h>
 #include <linux/module.h>
 #include <linux/ip.h>
 #include <linux/skbuff.h>
@@ -22,10 +22,10 @@
 #include <net/netlink.h>
 
 #include <linux/netfilter.h>
-#include <linux/netfilter/ip_set.h>
-#include <linux/netfilter/ip_set_timeout.h>
-#include <linux/netfilter/ip_set_getport.h>
-#include <linux/netfilter/ip_set_hash.h>
+#include <linux/netfilter/ipset/ip_set.h>
+#include <linux/netfilter/ipset/ip_set_timeout.h>
+#include <linux/netfilter/ipset/ip_set_getport.h>
+#include <linux/netfilter/ipset/ip_set_hash.h>
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>");
@@ -151,7 +151,7 @@ nla_put_failure:
 
 #define PF		4
 #define HOST_MASK	32
-#include <linux/netfilter/ip_set_chash.h>
+#include <linux/netfilter/ipset/ip_set_chash.h>
 
 static int
 hash_ipportnet4_kadt(struct ip_set *set, const struct sk_buff *skb,
@@ -386,7 +386,7 @@ nla_put_failure:
 
 #define PF		6
 #define HOST_MASK	128
-#include <linux/netfilter/ip_set_chash.h>
+#include <linux/netfilter/ipset/ip_set_chash.h>
 
 static int
 hash_ipportnet6_kadt(struct ip_set *set, const struct sk_buff *skb,
-- 
cgit v1.2.3