linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / net / Kconfig

diff --git a/net/Kconfig b/net/Kconfig
index 477ffd5..5126f58 100644 (file)
--- 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---
@@ -177,7 +170,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
@@ -222,21 +215,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
@@ -245,10 +223,6 @@ source "net/ax25/Kconfig"
 source "net/irda/Kconfig"
 source "net/bluetooth/Kconfig"
 source "net/ieee80211/Kconfig"
-source "net/tux/Kconfig"
-
-config WIRELESS_EXT
-       bool
 
 endif   # if NET
 endmenu # Networking