Merge tag 'master-2014-12-08' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...

[cascardo/linux.git] / net / openvswitch / Kconfig

diff --git a/net/openvswitch/Kconfig b/net/openvswitch/Kconfig
index ba3bb82..b7d818c 100644 (file)
--- a/net/openvswitch/Kconfig
+++ b/net/openvswitch/Kconfig
@@ -4,7 +4,9 @@
 
 config OPENVSWITCH
        tristate "Open vSwitch"
+       depends on INET
        select LIBCRC32C
+       select NET_MPLS_GSO
        ---help---
          Open vSwitch is a multilayer Ethernet switch targeted at virtualized
          environments.  In addition to supporting a variety of features
@@ -29,11 +31,10 @@ config OPENVSWITCH
          If unsure, say N.
 
 config OPENVSWITCH_GRE
-       bool "Open vSwitch GRE tunneling support"
-       depends on INET
+       tristate "Open vSwitch GRE tunneling support"
        depends on OPENVSWITCH
-       depends on NET_IPGRE_DEMUX && !(OPENVSWITCH=y && NET_IPGRE_DEMUX=m)
-       default y
+       depends on NET_IPGRE_DEMUX
+       default OPENVSWITCH
        ---help---
          If you say Y here, then the Open vSwitch will be able create GRE
          vport.
@@ -43,11 +44,10 @@ config OPENVSWITCH_GRE
          If unsure, say Y.
 
 config OPENVSWITCH_VXLAN
-       bool "Open vSwitch VXLAN tunneling support"
-       depends on INET
+       tristate "Open vSwitch VXLAN tunneling support"
        depends on OPENVSWITCH
-       depends on VXLAN && !(OPENVSWITCH=y && VXLAN=m)
-       default y
+       depends on VXLAN
+       default OPENVSWITCH
        ---help---
          If you say Y here, then the Open vSwitch will be able create vxlan vport.
 
@@ -56,11 +56,10 @@ config OPENVSWITCH_VXLAN
          If unsure, say Y.
 
 config OPENVSWITCH_GENEVE
-       bool "Open vSwitch Geneve tunneling support"
-       depends on INET
+       tristate "Open vSwitch Geneve tunneling support"
        depends on OPENVSWITCH
-       depends on GENEVE && !(OPENVSWITCH=y && GENEVE=m)
-       default y
+       depends on GENEVE
+       default OPENVSWITCH
        ---help---
          If you say Y here, then the Open vSwitch will be able create geneve vport.