diff options
| author | Patrick McHardy <kaber@trash.net> | 2006-12-02 22:11:01 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2006-12-02 22:11:01 -0800 |
| commit | a3c479772c9f4239749950e7c8ea0e9c914a9d7e (patch) | |
| tree | a6996d42891dafb46b6fcb19eb797ad092b7767a /net/netfilter | |
| parent | 807467c22a12381985878be23c778657fc0364d0 (diff) | |
| download | linux-stable-a3c479772c9f4239749950e7c8ea0e9c914a9d7e.tar.gz linux-stable-a3c479772c9f4239749950e7c8ea0e9c914a9d7e.tar.bz2 linux-stable-a3c479772c9f4239749950e7c8ea0e9c914a9d7e.zip | |
[NETFILTER]: Mark old IPv4-only connection tracking scheduled for removal
Also remove the references to "new connection tracking" from Kconfig.
After some short stabilization period of the new connection tracking
helpers/NAT code the old one will be removed.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netfilter')
| -rw-r--r-- | net/netfilter/Kconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig index e0deac17df12..3a66878a1829 100644 --- a/net/netfilter/Kconfig +++ b/net/netfilter/Kconfig @@ -56,7 +56,7 @@ config NF_CONNTRACK_SUPPORT below). config IP_NF_CONNTRACK_SUPPORT - bool "Layer 3 Dependent Connection tracking" + bool "Layer 3 Dependent Connection tracking (OBSOLETE)" help The old, Layer 3 dependent ip_conntrack subsystem of netfilter. @@ -125,7 +125,7 @@ config NF_CT_PROTO_GRE depends on EXPERIMENTAL && NF_CONNTRACK config NF_CT_PROTO_SCTP - tristate 'SCTP protocol on new connection tracking support (EXPERIMENTAL)' + tristate 'SCTP protocol connection tracking support (EXPERIMENTAL)' depends on EXPERIMENTAL && NF_CONNTRACK default n help @@ -151,7 +151,7 @@ config NF_CONNTRACK_AMANDA To compile it as a module, choose M here. If unsure, say N. config NF_CONNTRACK_FTP - tristate "FTP support on new connection tracking (EXPERIMENTAL)" + tristate "FTP protocol support (EXPERIMENTAL)" depends on EXPERIMENTAL && NF_CONNTRACK help Tracking FTP connections is problematic: special helpers are |