From cc9fa20c29936efd3c0975083fb550194dd69ac7 Mon Sep 17 00:00:00 2001 From: Patrick McHardy Date: Wed, 5 Dec 2007 01:31:52 -0800 Subject: [PATCH] --- yaml --- r: 78327 b: refs/heads/master c: 2eeeba390ae28fcd742e44706c363cb36bc614c6 h: refs/heads/master i: 78325: ed62ee4327c5f09df6c43c5022c2434e74188550 78323: 7ff224af7b2481a799ac60c6f29ae7db228983a7 78319: ad229f77b723929f349c71fea82148a7164edce3 v: v3 --- [refs] | 2 +- trunk/net/netfilter/Kconfig | 13 +++++-------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index cd3a6b77648b..a2e466e568b8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ab4f58c77a189d1100383e0c901cb8e90c3ab4f7 +refs/heads/master: 2eeeba390ae28fcd742e44706c363cb36bc614c6 diff --git a/trunk/net/netfilter/Kconfig b/trunk/net/netfilter/Kconfig index 772c58cc2c7e..bb61f83c7a75 100644 --- a/trunk/net/netfilter/Kconfig +++ b/trunk/net/netfilter/Kconfig @@ -2,21 +2,18 @@ menu "Core Netfilter Configuration" depends on NET && INET && NETFILTER config NETFILTER_NETLINK - tristate "Netfilter netlink interface" - help - If this option is enabled, the kernel will include support - for the new netfilter netlink interface. + tristate config NETFILTER_NETLINK_QUEUE tristate "Netfilter NFQUEUE over NFNETLINK interface" - depends on NETFILTER_NETLINK + select NETFILTER_NETLINK help If this option is enabled, the kernel will include support for queueing packets via NFNETLINK. config NETFILTER_NETLINK_LOG tristate "Netfilter LOG over NFNETLINK interface" - depends on NETFILTER_NETLINK + select NETFILTER_NETLINK help If this option is enabled, the kernel will include support for logging packets via NFNETLINK. @@ -246,8 +243,8 @@ config NF_CONNTRACK_TFTP config NF_CT_NETLINK tristate 'Connection tracking netlink interface (EXPERIMENTAL)' - depends on EXPERIMENTAL && NF_CONNTRACK && NETFILTER_NETLINK - depends on NF_CONNTRACK!=y || NETFILTER_NETLINK!=m + depends on EXPERIMENTAL && NF_CONNTRACK + select NETFILTER_NETLINK depends on NF_NAT=n || NF_NAT help This option enables support for a netlink-based userspace interface