Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a3c47977 authored by Patrick McHardy's avatar Patrick McHardy Committed by David S. Miller
Browse files

[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: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 807467c2

Documentation/feature-removal-schedule.txt

+9 −0
Original line number Diff line number Diff line
@@ -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>



---------------------------

net/ipv4/netfilter/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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

net/ipv6/netfilter/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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

net/netfilter/Kconfig

+3 −3
Original line number Diff line number Diff line
@@ -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