These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / net / openvswitch / Kconfig

diff --git a/kernel/net/openvswitch/Kconfig b/kernel/net/openvswitch/Kconfig
index ed6b0f8..d143aa9 100644 (file)
--- 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