vserver 2.0 rc7

[linux-2.6.git] / net / Kconfig

diff --git a/net/Kconfig b/net/Kconfig
index cae1350..9251b28 100644 (file)
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -45,15 +45,6 @@ config PACKET_MMAP
 
          If unsure, say N.
 
-config NETLINK_DEV
-       tristate "Netlink device emulation"
-       help
-         This option will be removed soon. Any programs that want to use
-         character special nodes like /dev/tap0 or /dev/route (all with major
-         number 36) need this option, and need to be rewritten soon to use
-         the real netlink socket.
-         This is a backward compatibility option, choose Y for now.
-
 config UNIX
        tristate "Unix domain sockets"
        ---help---
@@ -107,28 +98,24 @@ source "net/ipv4/Kconfig"
 
 #   IPv6 as module will cause a CRASH if you try to unload it
 config IPV6
-       tristate "The IPv6 protocol (EXPERIMENTAL)"
-       depends on INET && EXPERIMENTAL
+       tristate "The IPv6 protocol"
+       depends on INET
+       default m
        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
-         regular IPv4 networking as well.
-
-         Features of this new protocol include: expanded address space,
-         authentication and privacy, and seamless interoperability with the
-         current version of IP (IP version 4). For general information about
-         IPv6, see <http://playground.sun.com/pub/ipng/html/ipng-main.html>;
-         for specific information about IPv6 under Linux read the HOWTO at
-         <http://www.bieringer.de/linux/IPv6/> and the file net/ipv6/README
-         in the kernel source.
+         This is complemental support for the IP version 6.
+         You will still be able to do traditional IPv4 networking as well.
+
+         For general information about IPv6, see
+         <http://playground.sun.com/pub/ipng/html/ipng-main.html>.
+         For Linux IPv6 development information, see <http://www.linux-ipv6.org>.
+         For specific information about IPv6 under Linux, read the HOWTO at
+         <http://www.bieringer.de/linux/IPv6/>.
 
          To compile this protocol support as a module, choose M here: the 
          module will be called ipv6.
 
-         It is safe to say N here for now.
-
 source "net/ipv6/Kconfig"
 
 menuconfig NETFILTER
@@ -219,6 +206,10 @@ source "net/bridge/netfilter/Kconfig"
 
 endif
 
+config XFRM
+       bool
+       depends on NET
+
 source "net/xfrm/Kconfig"
 
 source "net/sctp/Kconfig"
@@ -564,24 +555,6 @@ config WAN_ROUTER
 
          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
@@ -635,7 +608,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