summary refs log tree commit diff
path: root/net/openvswitch/Kconfig
diff options
context:
space:
mode:
authorThomas Graf <tgraf@suug.ch>2015-07-29 13:52:06 +0200
committerDavid S. Miller <davem@davemloft.net>2015-07-29 23:03:10 -0700
commitdcc38c033b32b81b88b798f0c0b8453839ac996b (patch)
tree21db1c580a5c2e8b034ac185a27bad7af14a76fa /net/openvswitch/Kconfig
parent1ce4b2f44df74bac91ff5ddcbf903572577005bc (diff)
downloadlinux-dcc38c033b32b81b88b798f0c0b8453839ac996b.tar.gz
openvswitch: Re-add CONFIG_OPENVSWITCH_VXLAN
This readds the config option CONFIG_OPENVSWITCH_VXLAN to avoid a
hard dependency of OVS on VXLAN. It moves the VXLAN config compat
code to vport-vxlan.c and allows compliation as a module.

Fixes: 614732eaa12d ("openvswitch: Use regular VXLAN net_device device")
Fixes: 2661371ace96 ("openvswitch: fix compilation when vxlan is a module")
Cc: Pravin B Shelar <pshelar@nicira.com>
Cc: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: Thomas Graf <tgraf@suug.ch>
Acked-by: Pravin B Shelar <pshelar@nicira.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/openvswitch/Kconfig')
-rw-r--r--net/openvswitch/Kconfig13
1 files changed, 12 insertions, 1 deletions
diff --git a/net/openvswitch/Kconfig b/net/openvswitch/Kconfig
index 6ed1d2da9fcd..15840401a2ce 100644
--- a/net/openvswitch/Kconfig
+++ b/net/openvswitch/Kconfig
@@ -5,7 +5,6 @@
 config OPENVSWITCH
 	tristate "Open vSwitch"
 	depends on INET
-	depends on VXLAN
 	select LIBCRC32C
 	select MPLS
 	select NET_MPLS_GSO
@@ -45,6 +44,18 @@ config OPENVSWITCH_GRE
 
 	  If unsure, say Y.
 
+config OPENVSWITCH_VXLAN
+	tristate "Open vSwitch VXLAN tunneling support"
+	depends on OPENVSWITCH
+	depends on VXLAN
+	default OPENVSWITCH
+	---help---
+	  If you say Y here, then the Open vSwitch will be able create vxlan vport.
+
+	  Say N to exclude this support and reduce the binary size.
+
+	  If unsure, say Y.
+
 config OPENVSWITCH_GENEVE
 	tristate "Open vSwitch Geneve tunneling support"
 	depends on OPENVSWITCH