Merge branch 'stable/xen.pm.bug-fixes' of git://git.kernel.org/pub/scm/linux/kernel...

[deliverable/linux.git] / drivers / net / Kconfig

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 46e1b1a28b80359d8c924f7ab36fe945d91d1d95..dc280bc8eba2e0e0a8bc033b164d11b2707410bd 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -2108,6 +2108,7 @@ config E1000
 
 config E1000E
        tristate "Intel(R) PRO/1000 PCI-Express Gigabit Ethernet support"
+       select CRC32
        depends on PCI && (!SPARC32 || BROKEN)
        select CRC32
        ---help---
@@ -2953,12 +2954,38 @@ config XEN_NETDEV_FRONTEND
        select XEN_XENBUS_FRONTEND
        default y
        help
-         The network device frontend driver allows the kernel to
-         access network devices exported exported by a virtual
-         machine containing a physical network device driver. The
-         frontend driver is intended for unprivileged guest domains;
-         if you are compiling a kernel for a Xen guest, you almost
-         certainly want to enable this.
+         This driver provides support for Xen paravirtual network
+         devices exported by a Xen network driver domain (often
+         domain 0).
+
+         The corresponding Linux backend driver is enabled by the
+         CONFIG_XEN_NETDEV_BACKEND option.
+
+         If you are compiling a kernel for use as Xen guest, you
+         should say Y here. To compile this driver as a module, chose
+         M here: the module will be called xen-netfront.
+
+config XEN_NETDEV_BACKEND
+       tristate "Xen backend network device"
+       depends on XEN_BACKEND
+       help
+         This driver allows the kernel to act as a Xen network driver
+         domain which exports paravirtual network devices to other
+         Xen domains. These devices can be accessed by any operating
+         system that implements a compatible front end.
+
+         The corresponding Linux frontend driver is enabled by the
+         CONFIG_XEN_NETDEV_FRONTEND configuration option.
+
+         The backend driver presents a standard network device
+         endpoint for each paravirtual network device to the driver
+         domain network stack. These can then be bridged or routed
+         etc in order to provide full network connectivity.
+
+         If you are compiling a kernel to run in a Xen network driver
+         domain (often this is domain 0) you should say Y here. To
+         compile this driver as a module, chose M here: the module
+         will be called xen-netback.
 
 config ISERIES_VETH
        tristate "iSeries Virtual Ethernet driver support"