summaryrefslogtreecommitdiffstats
path: root/kernel/net/openvswitch/Kconfig
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/net/openvswitch/Kconfig')
-rw-r--r--kernel/net/openvswitch/Kconfig4
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/net/openvswitch/Kconfig b/kernel/net/openvswitch/Kconfig
index ed6b0f8dd..d143aa9f6 100644
--- a/kernel/net/openvswitch/Kconfig
+++ b/kernel/net/openvswitch/Kconfig
@@ -5,6 +5,8 @@
config OPENVSWITCH
tristate "Open vSwitch"
depends on INET
+ depends on !NF_CONNTRACK || \
+ (NF_CONNTRACK && (!NF_DEFRAG_IPV6 || NF_DEFRAG_IPV6))
select LIBCRC32C
select MPLS
select NET_MPLS_GSO
@@ -34,7 +36,7 @@ config OPENVSWITCH
config OPENVSWITCH_GRE
tristate "Open vSwitch GRE tunneling support"
depends on OPENVSWITCH
- depends on NET_IPGRE_DEMUX
+ depends on NET_IPGRE
default OPENVSWITCH
---help---
If you say Y here, then the Open vSwitch will be able create GRE