Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / arch / um / Kconfig.net

diff --git a/arch/um/Kconfig.net b/arch/um/Kconfig.net
index 14a04ebdeae9cbd02703f70556afed68b8a2a23c..9e9a4aaa703d60d77dc04aa6e8433bd2592a1f95 100644 (file)
--- a/arch/um/Kconfig.net
+++ b/arch/um/Kconfig.net
@@ -14,7 +14,7 @@ config UML_NET
 
         For more information, including explanations of the networking and
         sample configurations, see
 
         For more information, including explanations of the networking and
         sample configurations, see

-        <http://user-mode-linux.sourceforge.net/networking.html>.
+        <http://user-mode-linux.sourceforge.net/old/networking.html>.

 
         If you'd like to be able to enable networking in the User-Mode
         linux environment, say Y; otherwise say N.  Note that you must
 
         If you'd like to be able to enable networking in the User-Mode
         linux environment, say Y; otherwise say N.  Note that you must


@@ -38,7 +38,7 @@ config UML_NET_ETHERTAP
         CONFIG_NETLINK_DEV configured as Y or M.
 
         For more information, see
         CONFIG_NETLINK_DEV configured as Y or M.
 
         For more information, see

-        <http://user-mode-linux.sourceforge.net/networking.html>  That site
+        <http://user-mode-linux.sourceforge.net/old/networking.html>  That site

         has examples of the UML command line to use to enable Ethertap
         networking.
 
         has examples of the UML command line to use to enable Ethertap
         networking.
 


@@ -72,7 +72,7 @@ config UML_NET_SLIP
         To use this, your host must support slip devices.
 
         For more information, see
         To use this, your host must support slip devices.
 
         For more information, see

-        <http://user-mode-linux.sourceforge.net/networking.html>.  That site
+        <http://user-mode-linux.sourceforge.net/old/networking.html>.

         has examples of the UML command line to use to enable slip
         networking, and details of a few quirks with it.
 
         has examples of the UML command line to use to enable slip
         networking, and details of a few quirks with it.
 


@@ -96,7 +96,7 @@ config UML_NET_DAEMON
         networking daemon on the host.
 
         For more information, see
         networking daemon on the host.
 
         For more information, see

-        <http://user-mode-linux.sourceforge.net/networking.html>  That site
+        <http://user-mode-linux.sourceforge.net/old/networking.html>  That site

         has examples of the UML command line to use to enable Daemon
         networking.
 
         has examples of the UML command line to use to enable Daemon
         networking.
 


@@ -108,6 +108,28 @@ config UML_NET_DAEMON
         more than one without conflict.  If you don't need UML networking,
         say N.
 
         more than one without conflict.  If you don't need UML networking,
         say N.
 

+config UML_NET_VDE
+       bool "VDE transport"
+       depends on UML_NET
+       help
+       This User-Mode Linux network transport allows one or more running
+       UMLs on a single host to communicate with each other and also
+       with the rest of the world using Virtual Distributed Ethernet,
+       an improved fork of uml_switch.
+
+       You must have libvdeplug installed in order to build the vde
+       transport into UML.
+
+       To use this form of networking, you will need to run vde_switch
+       on the host.
+
+       For more information, see <http://wiki.virtualsquare.org/>
+       That site has a good overview of what VDE is and also examples
+       of the UML command line to use to enable VDE networking.
+
+       If you need UML networking with VDE,
+       say Y.
+

 config UML_NET_MCAST
        bool "Multicast transport"
        depends on UML_NET
 config UML_NET_MCAST
        bool "Multicast transport"
        depends on UML_NET


@@ -122,7 +144,7 @@ config UML_NET_MCAST
         To use this, your host kernel(s) must support IP Multicasting.
 
         For more information, see
         To use this, your host kernel(s) must support IP Multicasting.
 
         For more information, see

-        <http://user-mode-linux.sourceforge.net/networking.html>  That site
+        <http://user-mode-linux.sourceforge.net/old/networking.html>  That site

         has examples of the UML command line to use to enable Multicast
         networking, and notes about the security of this approach.
 
         has examples of the UML command line to use to enable Multicast
         networking, and notes about the security of this approach.
 


@@ -143,7 +165,7 @@ config UML_NET_PCAP
        installed in order to build the pcap transport into UML.
 
         For more information, see
        installed in order to build the pcap transport into UML.
 
         For more information, see

-        <http://user-mode-linux.sourceforge.net/networking.html>  That site
+        <http://user-mode-linux.sourceforge.net/old/networking.html>  That site

         has examples of the UML command line to use to enable this option.
 
        If you intend to use UML as a network monitor for the host, say
         has examples of the UML command line to use to enable this option.
 
        If you intend to use UML as a network monitor for the host, say