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)

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 (file)
index d770589..0000000
--- 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 b653036a600ac6b9879dd3aac6b3ef5e74c89b1f..a1fed99fcd83d2d51724bd7193e40532876360ce 100644 (file)
--- 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 c451b598d219b6eefbaa30e1170c38f88eb8dc2b..a70c601cc090bb18662155e74845a03001596eaf 100644 (file)
--- 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 3d5e6e339df77ebe80cc073ee258a9e9d9f9c1f3..ae1b2b3b7e604bb9b72acdc31bf4bc807276e249 100644 (file)
--- 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 1a9f72d33387a795b312b61ab72653a08587540e..9761487b03f34071454804859209795595cfbea6 100644 (file)
--- 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 b3744629144ad62d8c8ea7399d595bda5106cd9f..221abefc25422d54d70e2c94b6a9fa68e5821655 100644 (file)
--- 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 6953042362682bbb21e778981f3dec0810828675..494619b1bf708aa02b7df325e672e809ccb98b7a 100644 (file)
--- 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 94c6634452403a149247b83598ab81184c3303e5..0ac31c8256ca11db81828e304f238d6b5911b506 100644 (file)
--- 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 0768981989737578e60d819e0c963ac206223df5..908f580e05772980ac06c44cc7f5fc2b87b12347 100644 (file)
--- 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 e7f4016b4740fd3bf8f8e852fab998311a77083d..f2d91a988436047fbbba1e430ebdc3e7562813b9 100644 (file)
--- 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 d17f0779a43ffb91168f8d4c91e28966d7cc71fe..ef06aff7fdb458845e647bd53943779a65e16ae2 100644 (file)
--- 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 486e6a9a1610a461ab52344972e3a4707bf7467f..3525e3bd34000a1cfbaf815f1ff25aa453537eb5 100644 (file)
--- 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>