vserver 2.0-pre1

[linux-2.6.git] / net / Kconfig

diff --git a/net/Kconfig b/net/Kconfig
index 6b03321..435e535 100644 (file)
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -109,6 +109,8 @@ 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
@@ -217,6 +219,10 @@ source "net/bridge/netfilter/Kconfig"
 
 endif
 
+config XFRM
+       bool
+       depends on NET
+
 source "net/xfrm/Kconfig"
 
 source "net/sctp/Kconfig"
@@ -322,6 +328,19 @@ config BRIDGE
 
 config VLAN_8021Q
        tristate "802.1Q VLAN Support"
+       ---help---
+         Select this and you will be able to create 802.1Q VLAN interfaces
+         on your ethernet interfaces.  802.1Q VLAN supports almost
+         everything a regular ethernet interface does, including
+         firewalling, bridging, and of course IP traffic.  You will need
+         the 'vconfig' tool from the VLAN project in order to effectively
+         use VLANs.  See the VLAN web page for more information:
+         <http://www.candelatech.com/~greear/vlan.html>
+
+         To compile this code as a module, choose M here: the module
+         will be called 8021q.
+
+         If unsure, say N.
 
 config DECNET
        tristate "DECnet Support"
@@ -549,44 +568,6 @@ 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
-       ---help---
-         This option enables NIC (Network Interface Card) hardware throttling
-         during periods of extreme congestion. At the moment only a couple
-         of device drivers support it (really only one -- tulip, a modified
-         8390 driver can be found at
-         <ftp://ftp.tux.org/pub/net/ip-routing/fastroute/fastroute-8390.tar.gz>).
-
-         Really, this option is applicable to any machine attached to a fast
-         enough network, and even a 10 Mb NIC is able to kill a not very slow
-         box, such as a 120MHz Pentium.
-
-         However, do not say Y here if you did not experience any serious
-         problems.
-
-
 menu "QoS and/or fair queueing"
 
 config NET_SCHED
@@ -640,7 +621,7 @@ config NET_PKTGEN
          stress testing and performance analysis.  If you don't understand
          what was just said, you don't need it: say N.
 
-         Documentation on how to use the packet generaor can be found
+         Documentation on how to use the packet generator can be found
          at <file:Documentation/networking/pktgen.txt>.
 
          To compile this code as a module, choose M here: the