diff options
| author | Joe Stringer <joestringer@nicira.com> | 2015-09-04 13:07:40 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-09-06 23:48:33 -0700 |
| commit | f88f69dd17f150e2abcc7e2d95f895f2546fa381 (patch) | |
| tree | d20053f0128889945e7dc1e777c5bf33d458e957 /net/openvswitch/conntrack.h | |
| parent | 585e7e1a544c5b13b2a0014c23f3cb6622e8c995 (diff) | |
| download | linux-f88f69dd17f150e2abcc7e2d95f895f2546fa381.tar.bz2 | |
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/conntrack.h')
| -rw-r--r-- | net/openvswitch/conntrack.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/openvswitch/conntrack.h b/net/openvswitch/conntrack.h index 3cb30667a7dc..43f5dd7a5577 100644 --- a/net/openvswitch/conntrack.h +++ b/net/openvswitch/conntrack.h @@ -19,7 +19,7 @@ struct ovs_conntrack_info; enum ovs_key_attr; -#if defined(CONFIG_OPENVSWITCH_CONNTRACK) +#if IS_ENABLED(CONFIG_NF_CONNTRACK) void ovs_ct_init(struct net *); void ovs_ct_exit(struct net *); bool ovs_ct_verify(struct net *, enum ovs_key_attr attr); @@ -82,5 +82,5 @@ static inline int ovs_ct_put_key(const struct sw_flow_key *key, } static inline void ovs_ct_free_action(const struct nlattr *a) { } -#endif +#endif /* CONFIG_NF_CONNTRACK */ #endif /* ovs_conntrack.h */ |