This 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.

CC: "David S. Miller" <[email protected]>
Signed-off-by: Kees Cook <[email protected]>
---
 net/Kconfig |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/net/Kconfig b/net/Kconfig
index 30b48f5..7bdab26 100644
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -90,7 +90,6 @@ config NETWORK_SECMARK
 
 config NETWORK_PHY_TIMESTAMPING
        bool "Timestamping in PHY devices"
-       depends on EXPERIMENTAL
        help
          This allows timestamping of network packets by PHYs with
          hardware timestamping capabilities. This option adds some
@@ -278,7 +277,7 @@ config NET_PKTGEN
 
 config NET_TCPPROBE
        tristate "TCP connection probing"
-       depends on INET && EXPERIMENTAL && PROC_FS && KPROBES
+       depends on INET && PROC_FS && KPROBES
        ---help---
        This module allows for capturing the changes to TCP connection
        state in response to incoming packets. It is used for debugging
@@ -295,7 +294,7 @@ config NET_TCPPROBE
 
 config NET_DROP_MONITOR
        tristate "Network packet drop alerting service"
-       depends on INET && EXPERIMENTAL && TRACEPOINTS
+       depends on INET && TRACEPOINTS
        ---help---
        This feature provides an alerting service to userspace in the
        event that packets are discarded in the network stack.  Alerts
-- 
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to