Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

[linux.git] / net / Kconfig

diff --git a/net/Kconfig b/net/Kconfig
index c6cec5aa548604c87aa48ce43fd9c2007052f305..a81aca43932f975ed912e1f00482e24b5a6d7102 100644 (file)
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -177,7 +177,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
@@ -231,7 +231,7 @@ config NET_TCPPROBE
        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
+       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
@@ -249,6 +249,11 @@ source "net/ieee80211/Kconfig"
 config WIRELESS_EXT
        bool
 
+source "net/netlabel/Kconfig"
+
+config FIB_RULES
+       bool
+
 endif   # if NET
 endmenu # Networking