tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

Kees Cook 663ef0d1 e5a2f6e3

+8 -16
+8 -16
net/netfilter/Kconfig
··· 125 125 If unsure, say `N'. 126 126 127 127 config NF_CT_PROTO_DCCP 128 - tristate 'DCCP protocol connection tracking support (EXPERIMENTAL)' 129 - depends on EXPERIMENTAL 128 + tristate 'DCCP protocol connection tracking support' 130 129 depends on NETFILTER_ADVANCED 131 130 default IP_DCCP 132 131 help ··· 138 139 tristate 139 140 140 141 config NF_CT_PROTO_SCTP 141 - tristate 'SCTP protocol connection tracking support (EXPERIMENTAL)' 142 - depends on EXPERIMENTAL 142 + tristate 'SCTP protocol connection tracking support' 143 143 depends on NETFILTER_ADVANCED 144 144 default IP_SCTP 145 145 help ··· 279 281 To compile it as a module, choose M here. If unsure, say N. 280 282 281 283 config NF_CONNTRACK_SANE 282 - tristate "SANE protocol support (EXPERIMENTAL)" 283 - depends on EXPERIMENTAL 284 + tristate "SANE protocol support" 284 285 depends on NETFILTER_ADVANCED 285 286 help 286 287 SANE is a protocol for remote access to scanners as implemented ··· 406 409 407 410 # transparent proxy support 408 411 config NETFILTER_TPROXY 409 - tristate "Transparent proxying support (EXPERIMENTAL)" 410 - depends on EXPERIMENTAL 412 + tristate "Transparent proxying support" 411 413 depends on IP_NF_MANGLE 412 414 depends on NETFILTER_ADVANCED 413 415 help ··· 714 718 this clone be rerouted to another nexthop. 715 719 716 720 config NETFILTER_XT_TARGET_TPROXY 717 - tristate '"TPROXY" target support (EXPERIMENTAL)' 718 - depends on EXPERIMENTAL 721 + tristate '"TPROXY" target support' 719 722 depends on NETFILTER_TPROXY 720 723 depends on NETFILTER_XTABLES 721 724 depends on NETFILTER_ADVANCED ··· 778 783 To compile it as a module, choose M here. If unsure, say N. 779 784 780 785 config NETFILTER_XT_TARGET_TCPOPTSTRIP 781 - tristate '"TCPOPTSTRIP" target support (EXPERIMENTAL)' 782 - depends on EXPERIMENTAL 786 + tristate '"TCPOPTSTRIP" target support' 783 787 depends on IP_NF_MANGLE || IP6_NF_MANGLE 784 788 depends on NETFILTER_ADVANCED 785 789 help ··· 1139 1145 Official Website: <http://snowman.net/projects/ipt_recent/> 1140 1146 1141 1147 config NETFILTER_XT_MATCH_SCTP 1142 - tristate '"sctp" protocol match support (EXPERIMENTAL)' 1143 - depends on EXPERIMENTAL 1148 + tristate '"sctp" protocol match support' 1144 1149 depends on NETFILTER_ADVANCED 1145 1150 default IP_SCTP 1146 1151 help ··· 1151 1158 <file:Documentation/kbuild/modules.txt>. If unsure, say `N'. 1152 1159 1153 1160 config NETFILTER_XT_MATCH_SOCKET 1154 - tristate '"socket" match support (EXPERIMENTAL)' 1155 - depends on EXPERIMENTAL 1161 + tristate '"socket" match support' 1156 1162 depends on NETFILTER_TPROXY 1157 1163 depends on NETFILTER_XTABLES 1158 1164 depends on NETFILTER_ADVANCED