X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=net%2FKconfig;h=67e39ad8b8b6bfc92dff7745e8517f53fd73f54b;hb=a3df3b6f2e37474cdb8b56d55d31be41c22f9b18;hp=5126f58d9c44fb2b6dea23f3063904c8fa003243;hpb=536ea4e4198eeaa5a73fb734ea675e621609bb7e;p=powerpc.git

diff --git a/net/Kconfig b/net/Kconfig
index 5126f58d9c..67e39ad8b8 100644
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -63,9 +63,17 @@ config INET
 if INET
 source "net/ipv4/Kconfig"
 source "net/ipv6/Kconfig"
+source "net/netlabel/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---
@@ -170,7 +178,7 @@ source "net/lapb/Kconfig"
 
 config NET_DIVERT
 	bool "Frame Diverter (EXPERIMENTAL)"
-	depends on EXPERIMENTAL
+	depends on EXPERIMENTAL && BROKEN
 	---help---
 	  The Frame Diverter allows you to divert packets from the
 	  network, that are not aimed at the interface receiving it (in
@@ -215,6 +223,21 @@ 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 TCP connection probing 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
@@ -224,6 +247,12 @@ source "net/irda/Kconfig"
 source "net/bluetooth/Kconfig"
 source "net/ieee80211/Kconfig"
 
+config WIRELESS_EXT
+	bool
+
+config FIB_RULES
+	bool
+
 endif   # if NET
 endmenu # Networking