net/netfilter: remove depends on CONFIG_EXPERIMENTAL

The CONFIG_EXPERIMENTAL config item has not carried much meaning for a
while now and is almost always enabled by default. As agreed during the
Linux kernel summit, remove it from any "depends on" lines in Kconfigs.

CC: Pablo Neira Ayuso <pablo@netfilter.org>
CC: Patrick McHardy <kaber@trash.net>
CC: "David S. Miller" <davem@davemloft.net>
Signed-off-by: Kees Cook <keescook@chromium.org>
Acked-by: David S. Miller <davem@davemloft.net>

diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
index 49e96df5fbc4b38e842540f65c5b23309440c597..456833d7aaeaa205c25e083471f626b69dcd372a 100644 (file)
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
@@ -125,8 +125,7 @@ config NF_CONNTRACK_TIMESTAMP
          If unsure, say `N'.
 
 config NF_CT_PROTO_DCCP
-       tristate 'DCCP protocol connection tracking support (EXPERIMENTAL)'
-       depends on EXPERIMENTAL
+       tristate 'DCCP protocol connection tracking support'
        depends on NETFILTER_ADVANCED
        default IP_DCCP
        help
@@ -139,8 +138,7 @@ config NF_CT_PROTO_GRE
        tristate
 
 config NF_CT_PROTO_SCTP
-       tristate 'SCTP protocol connection tracking support (EXPERIMENTAL)'
-       depends on EXPERIMENTAL
+       tristate 'SCTP protocol connection tracking support'
        depends on NETFILTER_ADVANCED
        default IP_SCTP
        help
@@ -281,8 +279,7 @@ config NF_CONNTRACK_PPTP
          To compile it as a module, choose M here.  If unsure, say N.
 
 config NF_CONNTRACK_SANE
-       tristate "SANE protocol support (EXPERIMENTAL)"
-       depends on EXPERIMENTAL
+       tristate "SANE protocol support"
        depends on NETFILTER_ADVANCED
        help
          SANE is a protocol for remote access to scanners as implemented
@@ -409,8 +406,7 @@ endif # NF_CONNTRACK
 
 # transparent proxy support
 config NETFILTER_TPROXY
-       tristate "Transparent proxying support (EXPERIMENTAL)"
-       depends on EXPERIMENTAL
+       tristate "Transparent proxying support"
        depends on IP_NF_MANGLE
        depends on NETFILTER_ADVANCED
        help
@@ -718,8 +714,7 @@ config NETFILTER_XT_TARGET_TEE
        this clone be rerouted to another nexthop.
 
 config NETFILTER_XT_TARGET_TPROXY
-       tristate '"TPROXY" target support (EXPERIMENTAL)'
-       depends on EXPERIMENTAL
+       tristate '"TPROXY" target support'
        depends on NETFILTER_TPROXY
        depends on NETFILTER_XTABLES
        depends on NETFILTER_ADVANCED
@@ -783,8 +778,7 @@ config NETFILTER_XT_TARGET_TCPMSS
          To compile it as a module, choose M here.  If unsure, say N.
 
 config NETFILTER_XT_TARGET_TCPOPTSTRIP
-       tristate '"TCPOPTSTRIP" target support (EXPERIMENTAL)'
-       depends on EXPERIMENTAL
+       tristate '"TCPOPTSTRIP" target support'
        depends on IP_NF_MANGLE || IP6_NF_MANGLE
        depends on NETFILTER_ADVANCED
        help
@@ -1145,8 +1139,7 @@ config NETFILTER_XT_MATCH_RECENT
        Official Website: <http://snowman.net/projects/ipt_recent/>
 
 config NETFILTER_XT_MATCH_SCTP
-       tristate  '"sctp" protocol match support (EXPERIMENTAL)'
-       depends on EXPERIMENTAL
+       tristate  '"sctp" protocol match support'
        depends on NETFILTER_ADVANCED
        default IP_SCTP
        help
@@ -1158,8 +1151,7 @@ config NETFILTER_XT_MATCH_SCTP
          <file:Documentation/kbuild/modules.txt>.  If unsure, say `N'.
 
 config NETFILTER_XT_MATCH_SOCKET
-       tristate '"socket" match support (EXPERIMENTAL)'
-       depends on EXPERIMENTAL
+       tristate '"socket" match support'
        depends on NETFILTER_TPROXY
        depends on NETFILTER_XTABLES
        depends on NETFILTER_ADVANCED