diff options
| author | Patrick McHardy <kaber@trash.net> | 2007-12-05 01:31:37 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-28 14:56:24 -0800 |
| commit | ab4f58c77a189d1100383e0c901cb8e90c3ab4f7 (patch) | |
| tree | dab8d293a8d8c7a9dd911a8428770937d642530c /net | |
| parent | 4ad9d4fa94800573edaca18ba2f34f27137c9bc0 (diff) | |
| download | linux-3.10-ab4f58c77a189d1100383e0c901cb8e90c3ab4f7.tar.gz linux-3.10-ab4f58c77a189d1100383e0c901cb8e90c3ab4f7.tar.bz2 linux-3.10-ab4f58c77a189d1100383e0c901cb8e90c3ab4f7.zip | |
[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 <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/netfilter/Kconfig | 7 |
1 files changed, 1 insertions, 6 deletions
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 |