netfilter: remnants of ulog targets

netfilter: remnants of ulog targets

[Paul Bolle]

Pablo,

Your commit 7200135bc1e6 ("netfilter: kill ulog targets") landed in
today's linux-next (ie, next-20140723). It removes two Kconfig symbols:
IP_NF_TARGET_ULOG and BRIDGE_EBT_ULOG.

It left a few references to the related macros untouched:
    $ git grep -n -e IP_NF_TARGET_ULOG -e BRIDGE_EBT_ULOG next-20140723 | grep -v defconf
    next-20140723:include/net/netns/x_tables.h:18:#if IS_ENABLED(CONFIG_IP_NF_TARGET_ULOG)
    next-20140723:include/net/netns/x_tables.h:21:#if IS_ENABLED(CONFIG_BRIDGE_EBT_ULOG)
    next-20140723:net/bridge/netfilter/Makefile:39:obj-$(CONFIG_BRIDGE_EBT_ULOG) += ebt_ulog.o
    next-20140723:net/ipv4/netfilter/Makefile:60:obj-$(CONFIG_IP_NF_TARGET_ULOG) += ipt_ULOG.o

Is the trivial patch to clean up these remnants of the ulog targets
queued somewhere? If not, should I submit it?


Paul Bolle

Re: netfilter: remnants of ulog targets

[Pablo Neira Ayuso]

On Wed, Jul 23, 2014 at 11:28:14AM +0200, Paul Bolle wrote:
> Pablo,
> 
> Your commit 7200135bc1e6 ("netfilter: kill ulog targets") landed in
> today's linux-next (ie, next-20140723). It removes two Kconfig symbols:
> IP_NF_TARGET_ULOG and BRIDGE_EBT_ULOG.
> 
> It left a few references to the related macros untouched:
>     $ git grep -n -e IP_NF_TARGET_ULOG -e BRIDGE_EBT_ULOG next-20140723 | grep -v defconf
>     next-20140723:include/net/netns/x_tables.h:18:#if IS_ENABLED(CONFIG_IP_NF_TARGET_ULOG)
>     next-20140723:include/net/netns/x_tables.h:21:#if IS_ENABLED(CONFIG_BRIDGE_EBT_ULOG)
>     next-20140723:net/bridge/netfilter/Makefile:39:obj-$(CONFIG_BRIDGE_EBT_ULOG) += ebt_ulog.o
>     next-20140723:net/ipv4/netfilter/Makefile:60:obj-$(CONFIG_IP_NF_TARGET_ULOG) += ipt_ULOG.o
> 
> Is the trivial patch to clean up these remnants of the ulog targets
> queued somewhere? If not, should I submit it?

Yes, you can send me a patch to kill that dead code. Thanks.

[PATCH] [linux-next] netfilter: kill remnants of ulog targets

[Paul Bolle]

The ulog targets were recently killed. A few references to the Kconfig
macros CONFIG_IP_NF_TARGET_ULOG and CONFIG_BRIDGE_EBT_ULOG were left
untouched. Kill these too.

Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
---
Note that ulog_warn_deprecated and ebt_ulog_warn_deprecated do not exist
anymore. Neither do */ebt_ulog.c and */ipt_ULOG.c.

 include/net/netns/x_tables.h  | 6 ------
 net/bridge/netfilter/Makefile | 1 -
 net/ipv4/netfilter/Makefile   | 1 -
 3 files changed, 8 deletions(-)

diff --git a/include/net/netns/x_tables.h b/include/net/netns/x_tables.h
index 02fe40f8c8fd..c24060ee411e 100644
--- a/include/net/netns/x_tables.h
+++ b/include/net/netns/x_tables.h
@@ -15,11 +15,5 @@ struct netns_xt {
 	struct ebt_table *frame_filter;
 	struct ebt_table *frame_nat;
 #endif
-#if IS_ENABLED(CONFIG_IP_NF_TARGET_ULOG)
-	bool ulog_warn_deprecated;
-#endif
-#if IS_ENABLED(CONFIG_BRIDGE_EBT_ULOG)
-	bool ebt_ulog_warn_deprecated;
-#endif
 };
 #endif
diff --git a/net/bridge/netfilter/Makefile b/net/bridge/netfilter/Makefile
index 1f78ea0d90e4..e0560a60cad4 100644
--- a/net/bridge/netfilter/Makefile
+++ b/net/bridge/netfilter/Makefile
@@ -36,5 +36,4 @@ obj-$(CONFIG_BRIDGE_EBT_SNAT) += ebt_snat.o
 
 # watchers
 obj-$(CONFIG_BRIDGE_EBT_LOG) += ebt_log.o
-obj-$(CONFIG_BRIDGE_EBT_ULOG) += ebt_ulog.o
 obj-$(CONFIG_BRIDGE_EBT_NFLOG) += ebt_nflog.o
diff --git a/net/ipv4/netfilter/Makefile b/net/ipv4/netfilter/Makefile
index 245db9df3337..33001621465b 100644
--- a/net/ipv4/netfilter/Makefile
+++ b/net/ipv4/netfilter/Makefile
@@ -57,7 +57,6 @@ obj-$(CONFIG_IP_NF_TARGET_ECN) += ipt_ECN.o
 obj-$(CONFIG_IP_NF_TARGET_MASQUERADE) += ipt_MASQUERADE.o
 obj-$(CONFIG_IP_NF_TARGET_REJECT) += ipt_REJECT.o
 obj-$(CONFIG_IP_NF_TARGET_SYNPROXY) += ipt_SYNPROXY.o
-obj-$(CONFIG_IP_NF_TARGET_ULOG) += ipt_ULOG.o
 
 # generic ARP tables
 obj-$(CONFIG_IP_NF_ARPTABLES) += arp_tables.o
-- 
1.9.3

Re: [PATCH] [linux-next] netfilter: kill remnants of ulog targets

[Pablo Neira Ayuso]

On Fri, Jul 25, 2014 at 02:25:31PM +0200, Paul Bolle wrote:
> The ulog targets were recently killed. A few references to the Kconfig
> macros CONFIG_IP_NF_TARGET_ULOG and CONFIG_BRIDGE_EBT_ULOG were left
> untouched. Kill these too.

Those were my fault, applied, thanks Paul.