Make NF_CONNTRACK_IPV4 and NF_CONNTRACK_IPV6 select
NF_CONNTRACK_ENABLED.
This exposes IPv4/6 connection tracking options for easier
Kconfig setup.
Signed-off-by: Al Boldi <a1426z gawab.com>
Cc: Patrick McHardy <kaber trash.net>
Cc: David Miller <davem davemloft.net>
Cc: Sam Ravnborg <sam ravnborg.org>
Cc: Andrew Morton <akpm linux-foundation.org>
---
--- a/net/netfilter/Kconfig 2007-07-09 06:38:52.000000000
+0300
+++ b/net/netfilter/Kconfig 2007-07-25 17:37:16.000000000
+0300
 -28,6
+28,7  config NETFILTER_NETLINK_LOG
# Rename this to NF_CONNTRACK in a 2.6.25
config NF_CONNTRACK_ENABLED
tristate "Netfilter connection tracking
support"
+ select NF_CONNTRACK
help
Connection tracking keeps a record of what packets have
passed
through your machine, in order to figure out how they
are related
--- a/net/ipv4/netfilter/Kconfig 2007-07-09
06:38:50.000000000 +0300
+++ b/net/ipv4/netfilter/Kconfig 2007-07-25
17:37:39.000000000 +0300
 -7,7
+7,7  menu "IP: Netfilter Configuration"
config NF_CONNTRACK_IPV4
tristate "IPv4 connection tracking support (required
for NAT)"
- depends on NF_CONNTRACK
+ select NF_CONNTRACK_ENABLED
---help---
Connection tracking keeps a record of what packets have
passed
through your machine, in order to figure out how they
are related
--- a/net/ipv6/netfilter/Kconfig 2007-07-09
06:38:51.000000000 +0300
+++ b/net/ipv6/netfilter/Kconfig 2007-07-25
17:37:57.000000000 +0300
 -7,7
+7,8  menu "IPv6: Netfilter Configuration (EXP
config NF_CONNTRACK_IPV6
tristate "IPv6 connection tracking support
(EXPERIMENTAL)"
- depends on INET && IPV6 && EXPERIMENTAL
&& NF_CONNTRACK
+ depends on INET && IPV6 && EXPERIMENTAL
+ select NF_CONNTRACK_ENABLED
---help---
Connection tracking keeps a record of what packets have
passed
through your machine, in order to figure out how they
are related
|