X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=net%2FKconfig;h=79328dda777a9460783fdbfbf044cf83764d89d7;hb=9464c7cf61b9433057924c36e6e02f303a00e768;hp=705e6793c96339bff1663399f37b05744592ee7f;hpb=41689045f6a3cbe0550e1d34e9cc20d2e8c432ba;p=linux-2.6.git

diff --git a/net/Kconfig b/net/Kconfig
index 705e6793c..79328dda7 100644
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -66,13 +66,6 @@ source "net/ipv6/Kconfig"
 
 endif # if INET
 
-config NETWORK_SECMARK
-	bool "Security Marking"
-	help
-	  This enables security marking of network packets, similar
-	  to nfmark, but designated for security purposes.
-	  If you are unsure how to answer this question, answer N.
-
 menuconfig NETFILTER
 	bool "Network packet filtering (replaces ipchains)"
 	---help---
@@ -192,7 +185,7 @@ source "net/lapb/Kconfig"
 
 config NET_DIVERT
 	bool "Frame Diverter (EXPERIMENTAL)"
-	depends on EXPERIMENTAL && BROKEN
+	depends on EXPERIMENTAL
 	---help---
 	  The Frame Diverter allows you to divert packets from the
 	  network, that are not aimed at the interface receiving it (in
@@ -237,21 +230,6 @@ config NET_PKTGEN
 	  To compile this code as a module, choose M here: the
 	  module will be called pktgen.
 
-config NET_TCPPROBE
-	tristate "TCP connection probing"
-	depends on INET && EXPERIMENTAL && 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
-	TCP congestion avoidance modules. If you don't understand
-	what was just said, you don't need it: say N.
-
-	Documentation on how to use the packet generator can be found
-	at http://linux-net.osdl.org/index.php/TcpProbe
-
-	To compile this code as a module, choose M here: the
-	module will be called tcp_probe.
-
 endmenu
 
 endmenu