This commit was generated by cvs2svn to compensate for changes in r728,

[linux-2.6.git] / net / Kconfig

diff --git a/net/Kconfig b/net/Kconfig
index e2334b3..b75074c 100644 (file)
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -217,8 +217,27 @@ source "net/ipv6/netfilter/Kconfig"
 source "net/decnet/netfilter/Kconfig"
 source "net/bridge/netfilter/Kconfig"
 
+config VNET
+       tristate "PlanetLab Virtualized NETwork access"
+       depends on IP_NF_CONNTRACK
+       ---help---
+         VNET associates IP connections with VServer virtual contexts
+         and ensures that unprivileged contexts can receive only packets
+         related to connections initiated by, or bound to, sockets
+         created in their contexts.
+
+         For now, enabling or disabling this option does not compile
+         the driver or activate any non-default code paths. Compile
+         and load the VNET module separately.
+
+         If unsure, say N.
+
 endif
 
+config XFRM
+       bool
+       depends on NET
+
 source "net/xfrm/Kconfig"
 
 source "net/sctp/Kconfig"
@@ -324,6 +343,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"
@@ -551,24 +583,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