Merge tag 'sound-fix-4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[linux-beck.git] / net / openvswitch / Kconfig

diff --git a/net/openvswitch/Kconfig b/net/openvswitch/Kconfig
index d143aa9f66541898d558888b409414f618fc769d..234a73344c6e2043bd7042247d70fbab2c5ae782 100644 (file)
--- a/net/openvswitch/Kconfig
+++ b/net/openvswitch/Kconfig
@@ -6,10 +6,12 @@ config OPENVSWITCH
        tristate "Open vSwitch"
        depends on INET
        depends on !NF_CONNTRACK || \
-                  (NF_CONNTRACK && (!NF_DEFRAG_IPV6 || NF_DEFRAG_IPV6))
+                  (NF_CONNTRACK && ((!NF_DEFRAG_IPV6 || NF_DEFRAG_IPV6) && \
+                                    (!NF_NAT || NF_NAT)))
        select LIBCRC32C
        select MPLS
        select NET_MPLS_GSO
+       select DST_CACHE
        ---help---
          Open vSwitch is a multilayer Ethernet switch targeted at virtualized
          environments.  In addition to supporting a variety of features