From 4fa08a7ed14c20834f507eb7d3f141b59b539a47 Mon Sep 17 00:00:00 2001 From: Kees Cook Date: Tue, 2 Oct 2012 11:19:40 -0700 Subject: [PATCH] --- yaml --- r: 353561 b: refs/heads/master c: 911f86354d432f31b2966f41dcf8de8978a6b494 h: refs/heads/master i: 353559: bd9e4878e0cdd3a4257bf1e3893f45f082f38079 v: v3 --- [refs] | 2 +- trunk/net/Kconfig | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index f1d9d488cf56..eefb82f6faa6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 750358ee4f6ebafccf71b36fdc96d738706b4e37 +refs/heads/master: 911f86354d432f31b2966f41dcf8de8978a6b494 diff --git a/trunk/net/Kconfig b/trunk/net/Kconfig index 30b48f523135..7bdab2657106 100644 --- a/trunk/net/Kconfig +++ b/trunk/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