[NETFILTER]: New connection tracking is not EXPERIMENTAL anymore

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 14 insertions, 15 deletions

diff --git a/net/ipv4/netfilter/Kconfig b/net/ipv4/netfilter/Kconfig
index f6026d4ac428..47bd3ad18b71 100644
--- a/net/ipv4/netfilter/Kconfig
+++ b/net/ipv4/netfilter/Kconfig
@@ -6,8 +6,8 @@ menu "IP: Netfilter Configuration"
         depends on INET && NETFILTER
 
 config NF_CONNTRACK_IPV4
-        tristate "IPv4 connection tracking support (required for NAT) (EXPERIMENTAL)"
-        depends on EXPERIMENTAL && NF_CONNTRACK
+        tristate "IPv4 connection tracking support (required for NAT)"
+        depends on 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
diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
index 1b853c34d301..cd10e44db015 100644
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
@@ -44,8 +44,7 @@ choice
         depends on NF_CONNTRACK_ENABLED
 
 config NF_CONNTRACK_SUPPORT
-        bool "Layer 3 Independent Connection tracking (EXPERIMENTAL)"
-        depends on EXPERIMENTAL
+        bool "Layer 3 Independent Connection tracking"
         help
           Layer 3 independent connection tracking is experimental scheme
           which generalize ip_conntrack to support other layer 3 protocols.
@@ -122,7 +121,7 @@ config NF_CONNTRACK_EVENTS
 
 config NF_CT_PROTO_GRE
         tristate
-        depends on EXPERIMENTAL && NF_CONNTRACK
+        depends on NF_CONNTRACK
 
 config NF_CT_PROTO_SCTP
         tristate 'SCTP protocol connection tracking support (EXPERIMENTAL)'
@@ -136,8 +135,8 @@ config NF_CT_PROTO_SCTP
           Documentation/modules.txt.  If unsure, say `N'.
 
 config NF_CONNTRACK_AMANDA
-        tristate "Amanda backup protocol support (EXPERIMENTAL)"
-        depends on EXPERIMENTAL && NF_CONNTRACK
+        tristate "Amanda backup protocol support"
+        depends on NF_CONNTRACK
         select TEXTSEARCH
         select TEXTSEARCH_KMP
         help
@@ -151,8 +150,8 @@ config NF_CONNTRACK_AMANDA
           To compile it as a module, choose M here.  If unsure, say N.
 
 config NF_CONNTRACK_FTP
-        tristate "FTP protocol support (EXPERIMENTAL)"
-        depends on EXPERIMENTAL && NF_CONNTRACK
+        tristate "FTP protocol support"
+        depends on NF_CONNTRACK
         help
           Tracking FTP connections is problematic: special helpers are
           required for tracking them, and doing masquerading and other forms
@@ -184,8 +183,8 @@ config NF_CONNTRACK_H323
           To compile it as a module, choose M here.  If unsure, say N.
 
 config NF_CONNTRACK_IRC
-        tristate "IRC protocol support (EXPERIMENTAL)"
-        depends on EXPERIMENTAL && NF_CONNTRACK
+        tristate "IRC protocol support"
+        depends on NF_CONNTRACK
         help
           There is a commonly-used extension to IRC called
           Direct Client-to-Client Protocol (DCC).  This enables users to send
@@ -218,8 +217,8 @@ config NF_CONNTRACK_NETBIOS_NS
           To compile it as a module, choose M here.  If unsure, say N.
 
 config NF_CONNTRACK_PPTP
-        tristate "PPtP protocol support (EXPERIMENTAL)"
-        depends on EXPERIMENTAL && NF_CONNTRACK
+        tristate "PPtP protocol support"
+        depends on NF_CONNTRACK
         select NF_CT_PROTO_GRE
         help
           This module adds support for PPTP (Point to Point Tunnelling
@@ -249,8 +248,8 @@ config NF_CONNTRACK_SIP
           To compile it as a module, choose M here.  If unsure, say N.
 
 config NF_CONNTRACK_TFTP
-        tristate "TFTP protocol support (EXPERIMENTAL)"
-        depends on EXPERIMENTAL && NF_CONNTRACK
+        tristate "TFTP protocol support"
+        depends on NF_CONNTRACK
         help
           TFTP connection tracking helper, this is required depending
           on how restrictive your ruleset is.