* netfilter: remnants of ulog targets
@ 2014-07-23 9:28 Paul Bolle
2014-07-23 9:39 ` Pablo Neira Ayuso
0 siblings, 1 reply; 7+ messages in thread
From: Paul Bolle @ 2014-07-23 9:28 UTC (permalink / raw)
To: Pablo Neira Ayuso
Cc: Patrick McHardy, Jozsef Kadlecsik, netfilter-devel, coreteam
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
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: netfilter: remnants of ulog targets
2014-07-23 9:28 netfilter: remnants of ulog targets Paul Bolle
@ 2014-07-23 9:39 ` Pablo Neira Ayuso
2014-07-25 12:25 ` Paul Bolle
0 siblings, 1 reply; 7+ messages in thread
From: Pablo Neira Ayuso @ 2014-07-23 9:39 UTC (permalink / raw)
To: Paul Bolle; +Cc: Patrick McHardy, Jozsef Kadlecsik, netfilter-devel, coreteam
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.
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Bridge] [PATCH] [linux-next] netfilter: kill remnants of ulog targets
2014-07-23 9:39 ` Pablo Neira Ayuso
2014-07-25 12:25 ` Paul Bolle
@ 2014-07-25 12:25 ` Paul Bolle
0 siblings, 0 replies; 7+ messages in thread
From: Paul Bolle @ 2014-07-25 12:25 UTC (permalink / raw)
To: Pablo Neira Ayuso, David S. Miller, Patrick McHardy,
Jozsef Kadlecsik, Stephen Hemminger, Alexey Kuznetsov,
James Morris, Hideaki YOSHIFUJI
Cc: netdev, coreteam, netfilter-devel, linux-kernel, bridge
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
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH] [linux-next] netfilter: kill remnants of ulog targets
@ 2014-07-25 12:25 ` Paul Bolle
0 siblings, 0 replies; 7+ messages in thread
From: Paul Bolle @ 2014-07-25 12:25 UTC (permalink / raw)
To: Pablo Neira Ayuso, David S. Miller, Patrick McHardy,
Jozsef Kadlecsik, Stephen Hemminger, Alexey Kuznetsov,
James Morris, Hideaki YOSHIFUJI
Cc: netdev, coreteam, netfilter-devel, linux-kernel, bridge
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
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH] [linux-next] netfilter: kill remnants of ulog targets
@ 2014-07-25 12:25 ` Paul Bolle
0 siblings, 0 replies; 7+ messages in thread
From: Paul Bolle @ 2014-07-25 12:25 UTC (permalink / raw)
To: Pablo Neira Ayuso, David S. Miller, Patrick McHardy,
Jozsef Kadlecsik, Stephen Hemminger, Alexey Kuznetsov,
James Morris, Hideaki YOSHIFUJI
Cc: netdev, netfilter-devel, coreteam, bridge, linux-kernel
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
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [Bridge] [PATCH] [linux-next] netfilter: kill remnants of ulog targets
2014-07-25 12:25 ` Paul Bolle
@ 2014-07-25 13:01 ` Pablo Neira Ayuso
-1 siblings, 0 replies; 7+ messages in thread
From: Pablo Neira Ayuso @ 2014-07-25 13:01 UTC (permalink / raw)
To: Paul Bolle
Cc: Hideaki YOSHIFUJI, netdev, bridge, James Morris, Patrick McHardy,
Stephen Hemminger, coreteam, netfilter-devel, Jozsef Kadlecsik,
Alexey Kuznetsov, David S. Miller, linux-kernel
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.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] [linux-next] netfilter: kill remnants of ulog targets
@ 2014-07-25 13:01 ` Pablo Neira Ayuso
0 siblings, 0 replies; 7+ messages in thread
From: Pablo Neira Ayuso @ 2014-07-25 13:01 UTC (permalink / raw)
To: Paul Bolle
Cc: David S. Miller, Patrick McHardy, Jozsef Kadlecsik,
Stephen Hemminger, Alexey Kuznetsov, James Morris,
Hideaki YOSHIFUJI, netdev, netfilter-devel, coreteam, bridge,
linux-kernel
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.
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2014-07-25 13:01 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-07-23 9:28 netfilter: remnants of ulog targets Paul Bolle
2014-07-23 9:39 ` Pablo Neira Ayuso
2014-07-25 12:25 ` [Bridge] [PATCH] [linux-next] netfilter: kill " Paul Bolle
2014-07-25 12:25 ` Paul Bolle
2014-07-25 12:25 ` Paul Bolle
2014-07-25 13:01 ` [Bridge] " Pablo Neira Ayuso
2014-07-25 13:01 ` Pablo Neira Ayuso
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.