[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>
This commit is contained in:
parent
807467c22a
commit
a3c479772c
4 changed files with 14 additions and 5 deletions
|
@ -241,3 +241,12 @@ Why: Orphaned for ages. SMP bugs long unfixed. Few users left
|
||||||
Who: Jeff Garzik <jeff@garzik.org>
|
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>
|
||||||
|
|
||||||
|
---------------------------
|
||||||
|
|
|
@ -6,7 +6,7 @@ menu "IP: Netfilter Configuration"
|
||||||
depends on INET && NETFILTER
|
depends on INET && NETFILTER
|
||||||
|
|
||||||
config NF_CONNTRACK_IPV4
|
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
|
depends on EXPERIMENTAL && NF_CONNTRACK
|
||||||
---help---
|
---help---
|
||||||
Connection tracking keeps a record of what packets have passed
|
Connection tracking keeps a record of what packets have passed
|
||||||
|
|
|
@ -6,7 +6,7 @@ menu "IPv6: Netfilter Configuration (EXPERIMENTAL)"
|
||||||
depends on INET && IPV6 && NETFILTER && EXPERIMENTAL
|
depends on INET && IPV6 && NETFILTER && EXPERIMENTAL
|
||||||
|
|
||||||
config NF_CONNTRACK_IPV6
|
config NF_CONNTRACK_IPV6
|
||||||
tristate "IPv6 support for new connection tracking (EXPERIMENTAL)"
|
tristate "IPv6 connection tracking support (EXPERIMENTAL)"
|
||||||
depends on EXPERIMENTAL && NF_CONNTRACK
|
depends on EXPERIMENTAL && NF_CONNTRACK
|
||||||
---help---
|
---help---
|
||||||
Connection tracking keeps a record of what packets have passed
|
Connection tracking keeps a record of what packets have passed
|
||||||
|
|
|
@ -56,7 +56,7 @@ config NF_CONNTRACK_SUPPORT
|
||||||
below).
|
below).
|
||||||
|
|
||||||
config IP_NF_CONNTRACK_SUPPORT
|
config IP_NF_CONNTRACK_SUPPORT
|
||||||
bool "Layer 3 Dependent Connection tracking"
|
bool "Layer 3 Dependent Connection tracking (OBSOLETE)"
|
||||||
help
|
help
|
||||||
The old, Layer 3 dependent ip_conntrack subsystem of netfilter.
|
The old, Layer 3 dependent ip_conntrack subsystem of netfilter.
|
||||||
|
|
||||||
|
@ -125,7 +125,7 @@ config NF_CT_PROTO_GRE
|
||||||
depends on EXPERIMENTAL && NF_CONNTRACK
|
depends on EXPERIMENTAL && NF_CONNTRACK
|
||||||
|
|
||||||
config NF_CT_PROTO_SCTP
|
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
|
depends on EXPERIMENTAL && NF_CONNTRACK
|
||||||
default n
|
default n
|
||||||
help
|
help
|
||||||
|
@ -151,7 +151,7 @@ config NF_CONNTRACK_AMANDA
|
||||||
To compile it as a module, choose M here. If unsure, say N.
|
To compile it as a module, choose M here. If unsure, say N.
|
||||||
|
|
||||||
config NF_CONNTRACK_FTP
|
config NF_CONNTRACK_FTP
|
||||||
tristate "FTP support on new connection tracking (EXPERIMENTAL)"
|
tristate "FTP protocol support (EXPERIMENTAL)"
|
||||||
depends on EXPERIMENTAL && NF_CONNTRACK
|
depends on EXPERIMENTAL && NF_CONNTRACK
|
||||||
help
|
help
|
||||||
Tracking FTP connections is problematic: special helpers are
|
Tracking FTP connections is problematic: special helpers are
|
||||||
|
|
Loading…
Reference in a new issue