Patchwork netfilter: xt_NFLOG is dependant of nfnetlink_log

login
register
mail settings
Submitter Eric Leblond
Date Dec. 10, 2008, 6:49 p.m.
Message ID <1228934957-11967-1-git-send-email-eric@inl.fr>
Download mbox | patch
Permalink /patch/13303/
State Accepted
Delegated to: David Miller
Headers show

Comments

Eric Leblond - Dec. 10, 2008, 6:49 p.m.
The patch "don't call nf_log_packet in NFLOG module" make xt_NFLOG
dependant of nfnetlink_log. This patch forces the dependencies to fix
compilation in case only xt_NFLOG compilation was asked and modifies the
help message accordingly to the change.

Signed-off-by: Eric Leblond <eric@inl.fr>
---
 net/netfilter/Kconfig |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)
David Miller - Dec. 11, 2008, 1:24 a.m.
From: Eric Leblond <eric@inl.fr>
Date: Wed, 10 Dec 2008 19:49:17 +0100

> The patch "don't call nf_log_packet in NFLOG module" make xt_NFLOG
> dependant of nfnetlink_log. This patch forces the dependencies to fix
> compilation in case only xt_NFLOG compilation was asked and modifies the
> help message accordingly to the change.
> 
> Signed-off-by: Eric Leblond <eric@inl.fr>

I've applied this to net-next-2.6, thanks Eric.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
index 25dcef9..c2bac9c 100644
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
@@ -373,11 +373,10 @@  config NETFILTER_XT_TARGET_MARK
 config NETFILTER_XT_TARGET_NFLOG
 	tristate '"NFLOG" target support'
 	default m if NETFILTER_ADVANCED=n
+	select NETFILTER_NETLINK_LOG
 	help
 	  This option enables the NFLOG target, which allows to LOG
-	  messages through the netfilter logging API, which can use
-	  either the old LOG target, the old ULOG target or nfnetlink_log
-	  as backend.
+	  messages through nfnetlink_log.
 
 	  To compile it as a module, choose M here.  If unsure, say N.