diff options
| author | Joe Stringer <joestringer@nicira.com> | 2015-09-04 22:07:40 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-09-07 08:48:33 +0200 |
| commit | f88f69dd17f150e2abcc7e2d95f895f2546fa381 (patch) | |
| tree | d20053f0128889945e7dc1e777c5bf33d458e957 /net/openvswitch/Makefile | |
| parent | net: dsa: mv88e6171: add hardware 802.1Q support (diff) | |
| download | linux-f88f69dd17f150e2abcc7e2d95f895f2546fa381.tar.xz linux-f88f69dd17f150e2abcc7e2d95f895f2546fa381.zip | |
openvswitch: Remove conntrack Kconfig option.
There's no particular desire to have conntrack action support in Open
vSwitch as an independently configurable bit, rather just to ensure
there is not a hard dependency. This exposed option doesn't accurately
reflect the conntrack dependency when enabled, so simplify this by
removing the option. Compile the support if NF_CONNTRACK is enabled.
Fixes: 7f8a436eaa2c ("openvswitch: Add conntrack action")
Signed-off-by: Joe Stringer <joestringer@nicira.com>
Acked-by: Pravin B Shelar <pshelar@nicira.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/openvswitch/Makefile')
| -rw-r--r-- | net/openvswitch/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/openvswitch/Makefile b/net/openvswitch/Makefile index 5b5913b06f54..60f809085b92 100644 --- a/net/openvswitch/Makefile +++ b/net/openvswitch/Makefile @@ -15,7 +15,9 @@ openvswitch-y := \ vport-internal_dev.o \ vport-netdev.o -openvswitch-$(CONFIG_OPENVSWITCH_CONNTRACK) += conntrack.o +ifneq ($(CONFIG_NF_CONNTRACK),) +openvswitch-y += conntrack.o +endif obj-$(CONFIG_OPENVSWITCH_VXLAN)+= vport-vxlan.o obj-$(CONFIG_OPENVSWITCH_GENEVE)+= vport-geneve.o |