This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / net / Kconfig

diff --git a/net/Kconfig b/net/Kconfig
index e2334b3..6b03321 100644 (file)
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -109,8 +109,6 @@ source "net/ipv4/Kconfig"
 config IPV6
        tristate "The IPv6 protocol (EXPERIMENTAL)"
        depends on INET && EXPERIMENTAL
-       select CRYPTO if IPV6_PRIVACY
-       select CRYPTO_MD5 if IPV6_PRIVACY
        ---help---
          This is experimental support for the IP version 6 (formerly called
          IPng "IP next generation").  You will still be able to do
@@ -551,6 +549,26 @@ config WAN_ROUTER
 
          If unsure, say N.
 
+config NET_FASTROUTE
+       bool "Fast switching (read help!)"
+       depends on EXPERIMENTAL
+       ---help---
+         Saying Y here enables direct NIC-to-NIC (NIC = Network Interface
+         Card) data transfers on the local network, which is fast.
+
+         IMPORTANT NOTE: This option is NOT COMPATIBLE with "Network packet
+         filtering" (CONFIG_NETFILTER). Say N here if you say Y there.
+
+         However, it will work with all options in the "Advanced router"
+         section (except for "Use TOS value as routing key" and
+         "Use FWMARK value as routing key").
+
+         At the moment, few devices support fast switching (tulip is one of
+         them, a modified 8390 driver can be found at
+         <ftp://ftp.tux.org/pub/net/ip-routing/fastroute/fastroute-8390.tar.gz>).
+
+         If unsure, say N.
+
 config NET_HW_FLOWCONTROL
        bool "Forwarding between high speed interfaces"
        depends on EXPERIMENTAL
@@ -654,8 +672,6 @@ source "net/irda/Kconfig"
 
 source "net/bluetooth/Kconfig"
 
-source "net/tux/Kconfig"
-
 source "drivers/net/Kconfig"
 
 endmenu