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

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

diff --git a/kernel/net/openvswitch/Makefile b/kernel/net/openvswitch/Makefile
index 91b9478..60f8090 100644 (file)
--- a/kernel/net/openvswitch/Makefile
+++ b/kernel/net/openvswitch/Makefile
@@ -15,6 +15,10 @@ openvswitch-y := \
        vport-internal_dev.o \
        vport-netdev.o
 
+ifneq ($(CONFIG_NF_CONNTRACK),)
+openvswitch-y += conntrack.o
+endif
+
+obj-$(CONFIG_OPENVSWITCH_VXLAN)+= vport-vxlan.o
 obj-$(CONFIG_OPENVSWITCH_GENEVE)+= vport-geneve.o
-obj-$(CONFIG_OPENVSWITCH_VXLAN)        += vport-vxlan.o
 obj-$(CONFIG_OPENVSWITCH_GRE)  += vport-gre.o