Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...

[linux-2.6.git] / kernel / vserver / Kconfig

diff --git a/kernel/vserver/Kconfig b/kernel/vserver/Kconfig
index c665930..a38fe0b 100644 (file)
--- a/kernel/vserver/Kconfig
+++ b/kernel/vserver/Kconfig
@@ -29,14 +29,14 @@ config      VSERVER_LEGACY_VERSION
          so better avoid it, unless you really, really need it
          for backwards compatibility.
 
-config VSERVER_NGNET
-       bool    "Disable Legacy Networking Kernel API"
-       depends on EXPERIMENTAL
-       default n
+config VSERVER_LEGACYNET
+       bool    "Enable Legacy Networking Kernel API"
+       default y
        help
-         This disables the legacy networking API which is required
-         by the chbind tool. Do not disable it unless you exactly
-         know what you are doing.
+         This enables the legacy networking API which is required
+         by the chbind tool (for util-vserver versions prior to
+         0.30.210). If you use an older version, don't disable
+         this option.
 
 config VSERVER_REMAP_SADDR
        bool    "Remap Source IP Address"
@@ -182,8 +182,8 @@ config      VSERVER_SECURITY
        default y
        select SECURITY_CAPABILITIES
 
-config VSERVER_LEGACYNET
+config VSERVER_NGNET
        bool
-       depends on !VSERVER_NGNET
+       depends on EXPERIMENTAL && !VSERVER_LEGACYNET
        default y