From: Patrick McHardy Date: Wed, 5 Dec 2007 09:31:37 +0000 (-0800) Subject: [NETFILTER]: remove NF_CONNTRACK_ENABLED option X-Git-Tag: v2.6.25-rc1~1162^2~1222 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=ab4f58c77a189d1100383e0c901cb8e90c3ab4f7;p=linux-2.6-omap-h63xx.git [NETFILTER]: remove NF_CONNTRACK_ENABLED option Remove the NF_CONNTRACK_ENABLED option. It was meant for a smoother upgrade to nf_conntrack, people having reconfigured their kernel at least once since ip_conntrack was removed will have the NF_CONNTRACK option already set. People upgrading from older kernels have to reconfigure a lot anyway. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller --- diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig index 4182393186a..772c58cc2c7 100644 --- a/net/netfilter/Kconfig +++ b/net/netfilter/Kconfig @@ -25,8 +25,7 @@ config NETFILTER_NETLINK_LOG and is also scheduled to replace the old syslog-based ipt_LOG and ip6t_LOG modules. -# Rename this to NF_CONNTRACK in a 2.6.25 -config NF_CONNTRACK_ENABLED +config NF_CONNTRACK tristate "Netfilter connection tracking support" help Connection tracking keeps a record of what packets have passed @@ -40,10 +39,6 @@ config NF_CONNTRACK_ENABLED To compile it as a module, choose M here. If unsure, say N. -config NF_CONNTRACK - tristate - default NF_CONNTRACK_ENABLED - config NF_CT_ACCT bool "Connection tracking flow accounting" depends on NF_CONNTRACK