Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs...

[~andy/linux] / drivers / net / Kconfig

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 707ab7bd4ea51688f502fa528d57371b3fdb3438..6a70184c3f237d832a265afbef7779e659686df2 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -149,6 +149,19 @@ config MACVTAP
          To compile this driver as a module, choose M here: the module
          will be called macvtap.
 
+config VXLAN
+       tristate "Virtual eXtensible Local Area Network (VXLAN)"
+       depends on EXPERIMENTAL && INET
+       ---help---
+         This allows one to create vxlan virtual interfaces that provide
+         Layer 2 Networks over Layer 3 Networks. VXLAN is often used
+         to tunnel virtual network infrastructure in virtualized environments.
+         For more information see:
+           http://tools.ietf.org/html/draft-mahalingam-dutt-dcops-vxlan-02
+
+         To compile this driver as a module, choose M here: the module
+         will be called vxlan.
+
 config NETCONSOLE
        tristate "Network console logging support"
        ---help---