From: Harald Welte <laforge@netfilter.org>
Date: Tue, 11 Oct 2005 03:51:53 +0000 (-0700)
Subject: [NETFILTER] ipt_ULOG: Mark ipt_ULOG as OBSOLETE
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f40863cec87464f3f4ec3a6c00e3fda3bbb0c91b;p=linux.git

[NETFILTER] ipt_ULOG: Mark ipt_ULOG as OBSOLETE

Similar to nfnetlink_queue and ip_queue, we mark ipt_ULOG as obsolete.
This should have been part of the original nfnetlink_log merge, but
I somehow missed it.

Signed-off-by: Harald Welte <laforge@netfilter.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/ipv4/netfilter/Kconfig b/net/ipv4/netfilter/Kconfig
index 4b6f80775fb00..7d917e4ce1d97 100644
--- a/net/ipv4/netfilter/Kconfig
+++ b/net/ipv4/netfilter/Kconfig
@@ -499,9 +499,14 @@ config IP_NF_TARGET_LOG
 	  To compile it as a module, choose M here.  If unsure, say N.
 
 config IP_NF_TARGET_ULOG
-	tristate "ULOG target support"
+	tristate "ULOG target support (OBSOLETE)"
 	depends on IP_NF_IPTABLES
 	---help---
+
+	  This option enables the old IPv4-only "ipt_ULOG" implementation
+	  which has been obsoleted by the new "nfnetlink_log" code (see
+	  CONFIG_NETFILTER_NETLINK_LOG).
+
 	  This option adds a `ULOG' target, which allows you to create rules in
 	  any iptables table. The packet is passed to a userspace logging
 	  daemon using netlink multicast sockets; unlike the LOG target