- merge revision 1.6

date: 2005/02/01 03:10:45;  author: mlhuang;  state: Exp;  lines: +15 -0
- bound vnet mods by #ifdef

diff --git a/net/Kconfig b/net/Kconfig
index e2334b3..c630878 100644 (file)
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -217,6 +217,21 @@ 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
 
 source "net/xfrm/Kconfig"