Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband

[linux-drm-fsl-dcu.git] / net / Kconfig

diff --git a/net/Kconfig b/net/Kconfig
index 4959a4e1e0feca3fa2b0a304f8cf175a27c90487..915657832d944c10a537f3dbd3ce3d3d69745fb0 100644 (file)
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -37,6 +37,7 @@ config NETDEBUG
 source "net/packet/Kconfig"
 source "net/unix/Kconfig"
 source "net/xfrm/Kconfig"
+source "net/iucv/Kconfig"
 
 config INET
        bool "TCP/IP networking"
@@ -63,6 +64,7 @@ config INET
 if INET
 source "net/ipv4/Kconfig"
 source "net/ipv6/Kconfig"
+source "net/netlabel/Kconfig"
 
 endif # if INET
 
@@ -74,7 +76,7 @@ config NETWORK_SECMARK
          If you are unsure how to answer this question, answer N.
 
 menuconfig NETFILTER
-       bool "Network packet filtering (replaces ipchains)"
+       bool "Network packet filtering framework (Netfilter)"
        ---help---
          Netfilter is a framework for filtering and mangling network packets
          that pass through your Linux box.
@@ -174,33 +176,6 @@ source "net/ipx/Kconfig"
 source "drivers/net/appletalk/Kconfig"
 source "net/x25/Kconfig"
 source "net/lapb/Kconfig"
-
-config NET_DIVERT
-       bool "Frame Diverter (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
-         promisc. mode). Typically, a Linux box setup as an Ethernet bridge
-         with the Frames Diverter on, can do some *really* transparent www
-         caching using a Squid proxy for example.
-
-         This is very useful when you don't want to change your router's
-         config (or if you simply don't have access to it).
-
-         The other possible usages of diverting Ethernet Frames are
-         numberous:
-         - reroute smtp traffic to another interface
-         - traffic-shape certain network streams
-         - transparently proxy smtp connections
-         - etc...
-
-         For more informations, please refer to:
-         <http://diverter.sourceforge.net/>
-         <http://perso.wanadoo.fr/magpie/EtherDivert.html>
-
-         If unsure, say N.
-
 source "net/econet/Kconfig"
 source "net/wanrouter/Kconfig"
 source "net/sched/Kconfig"
@@ -231,7 +206,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 +224,9 @@ source "net/ieee80211/Kconfig"
 config WIRELESS_EXT
        bool
 
+config FIB_RULES
+       bool
+
 endif   # if NET
 endmenu # Networking