From eb0a9bd761f019f9d5588090c193a39506506240 Mon Sep 17 00:00:00 2001
From: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Date: Thu, 20 Jan 2011 10:25:04 +0100
Subject: [PATCH] Get rid of ip_set_kernel.h

The header file was useful at deep debugging only, we can get rid of now.
(Patrick McHardy's review)
---
 .../include/linux/netfilter/ipset/ip_set_kernel.h | 15 ---------------
 kernel/ip_set_bitmap_ip.c                         |  1 -
 kernel/ip_set_bitmap_ipmac.c                      |  1 -
 kernel/ip_set_bitmap_port.c                       |  1 -
 kernel/ip_set_core.c                              |  1 -
 kernel/ip_set_hash_ip.c                           |  1 -
 kernel/ip_set_hash_ipport.c                       |  1 -
 kernel/ip_set_hash_ipportip.c                     |  1 -
 kernel/ip_set_hash_ipportnet.c                    |  1 -
 kernel/ip_set_hash_net.c                          |  1 -
 kernel/ip_set_hash_netport.c                      |  1 -
 kernel/ip_set_list_set.c                          |  1 -
 12 files changed, 26 deletions(-)
 delete mode 100644 kernel/include/linux/netfilter/ipset/ip_set_kernel.h

diff --git a/kernel/include/linux/netfilter/ipset/ip_set_kernel.h b/kernel/include/linux/netfilter/ipset/ip_set_kernel.h
deleted file mode 100644
index d770589d..00000000
--- a/kernel/include/linux/netfilter/ipset/ip_set_kernel.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef _IP_SET_KERNEL_H
-#define _IP_SET_KERNEL_H
-
-#ifdef __KERNEL__
-
-#ifdef CONFIG_DEBUG_KERNEL
-/* Complete debug messages */
-#define pr_fmt(fmt) "%s %s[%i]: " fmt "\n", __FILE__, __func__, __LINE__
-#endif
-
-#include <linux/kernel.h>
-
-#endif	/* __KERNEL__ */
-
-#endif /*_IP_SET_H */
diff --git a/kernel/ip_set_bitmap_ip.c b/kernel/ip_set_bitmap_ip.c
index b653036a..a1fed99f 100644
--- a/kernel/ip_set_bitmap_ip.c
+++ b/kernel/ip_set_bitmap_ip.c
@@ -9,7 +9,6 @@
 
 /* Kernel module implementing an IP set type: the bitmap:ip type */
 
-#include <linux/netfilter/ipset/ip_set_kernel.h>
 #include <linux/module.h>
 #include <linux/ip.h>
 #include <linux/skbuff.h>
diff --git a/kernel/ip_set_bitmap_ipmac.c b/kernel/ip_set_bitmap_ipmac.c
index c451b598..a70c601c 100644
--- a/kernel/ip_set_bitmap_ipmac.c
+++ b/kernel/ip_set_bitmap_ipmac.c
@@ -10,7 +10,6 @@
 
 /* Kernel module implementing an IP set type: the bitmap:ip,mac type */
 
-#include <linux/netfilter/ipset/ip_set_kernel.h>
 #include <linux/module.h>
 #include <linux/ip.h>
 #include <linux/etherdevice.h>
diff --git a/kernel/ip_set_bitmap_port.c b/kernel/ip_set_bitmap_port.c
index 3d5e6e33..ae1b2b3b 100644
--- a/kernel/ip_set_bitmap_port.c
+++ b/kernel/ip_set_bitmap_port.c
@@ -7,7 +7,6 @@
 
 /* Kernel module implementing an IP set type: the bitmap:port type */
 
-#include <linux/netfilter/ipset/ip_set_kernel.h>
 #include <linux/module.h>
 #include <linux/ip.h>
 #include <linux/tcp.h>
diff --git a/kernel/ip_set_core.c b/kernel/ip_set_core.c
index 1a9f72d3..9761487b 100644
--- a/kernel/ip_set_core.c
+++ b/kernel/ip_set_core.c
@@ -9,7 +9,6 @@
 
 /* Kernel module for IP set management */
 
-#include <linux/netfilter/ipset/ip_set_kernel.h>
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
diff --git a/kernel/ip_set_hash_ip.c b/kernel/ip_set_hash_ip.c
index b3744629..221abefc 100644
--- a/kernel/ip_set_hash_ip.c
+++ b/kernel/ip_set_hash_ip.c
@@ -7,7 +7,6 @@
 
 /* Kernel module implementing an IP set type: the hash:ip type */
 
-#include <linux/netfilter/ipset/ip_set_kernel.h>
 #include <linux/jhash.h>
 #include <linux/module.h>
 #include <linux/ip.h>
diff --git a/kernel/ip_set_hash_ipport.c b/kernel/ip_set_hash_ipport.c
index 69530423..494619b1 100644
--- a/kernel/ip_set_hash_ipport.c
+++ b/kernel/ip_set_hash_ipport.c
@@ -7,7 +7,6 @@
 
 /* Kernel module implementing an IP set type: the hash:ip,port type */
 
-#include <linux/netfilter/ipset/ip_set_kernel.h>
 #include <linux/jhash.h>
 #include <linux/module.h>
 #include <linux/ip.h>
diff --git a/kernel/ip_set_hash_ipportip.c b/kernel/ip_set_hash_ipportip.c
index 94c66344..0ac31c82 100644
--- a/kernel/ip_set_hash_ipportip.c
+++ b/kernel/ip_set_hash_ipportip.c
@@ -7,7 +7,6 @@
 
 /* Kernel module implementing an IP set type: the hash:ip,port,ip type */
 
-#include <linux/netfilter/ipset/ip_set_kernel.h>
 #include <linux/jhash.h>
 #include <linux/module.h>
 #include <linux/ip.h>
diff --git a/kernel/ip_set_hash_ipportnet.c b/kernel/ip_set_hash_ipportnet.c
index 07689819..908f580e 100644
--- a/kernel/ip_set_hash_ipportnet.c
+++ b/kernel/ip_set_hash_ipportnet.c
@@ -7,7 +7,6 @@
 
 /* Kernel module implementing an IP set type: the hash:ip,port,net type */
 
-#include <linux/netfilter/ipset/ip_set_kernel.h>
 #include <linux/jhash.h>
 #include <linux/module.h>
 #include <linux/ip.h>
diff --git a/kernel/ip_set_hash_net.c b/kernel/ip_set_hash_net.c
index e7f4016b..f2d91a98 100644
--- a/kernel/ip_set_hash_net.c
+++ b/kernel/ip_set_hash_net.c
@@ -7,7 +7,6 @@
 
 /* Kernel module implementing an IP set type: the hash:net type */
 
-#include <linux/netfilter/ipset/ip_set_kernel.h>
 #include <linux/jhash.h>
 #include <linux/module.h>
 #include <linux/ip.h>
diff --git a/kernel/ip_set_hash_netport.c b/kernel/ip_set_hash_netport.c
index d17f0779..ef06aff7 100644
--- a/kernel/ip_set_hash_netport.c
+++ b/kernel/ip_set_hash_netport.c
@@ -7,7 +7,6 @@
 
 /* Kernel module implementing an IP set type: the hash:net,port type */
 
-#include <linux/netfilter/ipset/ip_set_kernel.h>
 #include <linux/jhash.h>
 #include <linux/module.h>
 #include <linux/ip.h>
diff --git a/kernel/ip_set_list_set.c b/kernel/ip_set_list_set.c
index 486e6a9a..3525e3bd 100644
--- a/kernel/ip_set_list_set.c
+++ b/kernel/ip_set_list_set.c
@@ -7,7 +7,6 @@
 
 /* Kernel module implementing an IP set type: the list:set type */
 
-#include <linux/netfilter/ipset/ip_set_kernel.h>
 #include <linux/module.h>
 #include <linux/ip.h>
 #include <linux/skbuff.h>
-- 
2.47.3