diff options
author | Kees Cook <keescook@chromium.org> | 2012-10-02 14:19:40 -0400 |
---|---|---|
committer | Kees Cook <keescook@chromium.org> | 2013-01-11 14:39:33 -0500 |
commit | 911f86354d432f31b2966f41dcf8de8978a6b494 (patch) | |
tree | bb0aee84ad975d8af34567be11358fddababee9d /net | |
parent | 750358ee4f6ebafccf71b36fdc96d738706b4e37 (diff) |
net: 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: "David S. Miller" <davem@davemloft.net>
Signed-off-by: Kees Cook <keescook@chromium.org>
Acked-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r-- | net/Kconfig | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/Kconfig b/net/Kconfig index 30b48f523135..7bdab2657106 100644 --- a/net/Kconfig +++ b/net/Kconfig | |||
@@ -90,7 +90,6 @@ config NETWORK_SECMARK | |||
90 | 90 | ||
91 | config NETWORK_PHY_TIMESTAMPING | 91 | config NETWORK_PHY_TIMESTAMPING |
92 | bool "Timestamping in PHY devices" | 92 | bool "Timestamping in PHY devices" |
93 | depends on EXPERIMENTAL | ||
94 | help | 93 | help |
95 | This allows timestamping of network packets by PHYs with | 94 | This allows timestamping of network packets by PHYs with |
96 | hardware timestamping capabilities. This option adds some | 95 | hardware timestamping capabilities. This option adds some |
@@ -278,7 +277,7 @@ config NET_PKTGEN | |||
278 | 277 | ||
279 | config NET_TCPPROBE | 278 | config NET_TCPPROBE |
280 | tristate "TCP connection probing" | 279 | tristate "TCP connection probing" |
281 | depends on INET && EXPERIMENTAL && PROC_FS && KPROBES | 280 | depends on INET && PROC_FS && KPROBES |
282 | ---help--- | 281 | ---help--- |
283 | This module allows for capturing the changes to TCP connection | 282 | This module allows for capturing the changes to TCP connection |
284 | state in response to incoming packets. It is used for debugging | 283 | state in response to incoming packets. It is used for debugging |
@@ -295,7 +294,7 @@ config NET_TCPPROBE | |||
295 | 294 | ||
296 | config NET_DROP_MONITOR | 295 | config NET_DROP_MONITOR |
297 | tristate "Network packet drop alerting service" | 296 | tristate "Network packet drop alerting service" |
298 | depends on INET && EXPERIMENTAL && TRACEPOINTS | 297 | depends on INET && TRACEPOINTS |
299 | ---help--- | 298 | ---help--- |
300 | This feature provides an alerting service to userspace in the | 299 | This feature provides an alerting service to userspace in the |
301 | event that packets are discarded in the network stack. Alerts | 300 | event that packets are discarded in the network stack. Alerts |