[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>

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 82447163a0c25ffa6ffc2b1424a43f5603722ba4..f81819364b7ab9ebade50ccc24ed494219160ed6 100644 (file)
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -241,3 +241,12 @@ Why:       Orphaned for ages.  SMP bugs long unfixed.  Few users left
 Who:   Jeff Garzik <jeff@garzik.org>
 
 ---------------------------
+
+What:  IPv4 only connection tracking/NAT/helpers
+When:  2.6.22
+Why:   The new layer 3 independant connection tracking replaces the old
+       IPv4 only version. After some stabilization of the new code the
+       old one will be removed.
+Who:   Patrick McHardy <kaber@trash.net>
+
+---------------------------

diff --git a/net/ipv4/netfilter/Kconfig b/net/ipv4/netfilter/Kconfig
index 16390add2ebf2a471ee6d98489f13c3c67949583..363df9976c9d412a959b2aa3fad790d31a4d90d3 100644 (file)
--- a/net/ipv4/netfilter/Kconfig
+++ b/net/ipv4/netfilter/Kconfig
@@ -6,7 +6,7 @@ menu "IP: Netfilter Configuration"
        depends on INET && NETFILTER
 
 config NF_CONNTRACK_IPV4
-       tristate "IPv4 support for new connection tracking (required for NAT) (EXPERIMENTAL)"
+       tristate "IPv4 connection tracking support (required for NAT) (EXPERIMENTAL)"
        depends on EXPERIMENTAL && NF_CONNTRACK
        ---help---
          Connection tracking keeps a record of what packets have passed

diff --git a/net/ipv6/netfilter/Kconfig b/net/ipv6/netfilter/Kconfig
index d7c45a9c15feb6994fa55614a69f663dde9c724c..fc3e5eb4bc3f62b8b7c251a639f5a33056fb89cd 100644 (file)
--- a/net/ipv6/netfilter/Kconfig
+++ b/net/ipv6/netfilter/Kconfig
@@ -6,7 +6,7 @@ menu "IPv6: Netfilter Configuration (EXPERIMENTAL)"
        depends on INET && IPV6 && NETFILTER && EXPERIMENTAL
 
 config NF_CONNTRACK_IPV6
-       tristate "IPv6 support for new connection tracking (EXPERIMENTAL)"
+       tristate "IPv6 connection tracking support (EXPERIMENTAL)"
        depends on EXPERIMENTAL && NF_CONNTRACK
        ---help---
          Connection tracking keeps a record of what packets have passed

diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
index e0deac17df12d163bf4442b856fdf9aded3ce781..3a66878a1829152d6aa69cfc474b19513f3f3c82 100644 (file)
--- 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