diff options
| author | Joe Stringer <joe@ovn.org> | 2015-12-15 11:24:34 -0800 |
|---|---|---|
| committer | Joe Stringer <joe@ovn.org> | 2015-12-18 17:27:11 -0800 |
| commit | f2ab1536ddbc5338a3ae40225d3e73ec3068aee7 (patch) | |
| tree | b888bbcbdea68ac7e3e3cfc61c3a102df4c34051 /datapath/conntrack.c | |
| parent | f2e11497cd458a94bdfe2f472fe15b5c128566f7 (diff) | |
| download | openvswitch-f2ab1536ddbc5338a3ae40225d3e73ec3068aee7.tar.gz | |
compat: Backport conntrack strictly to v3.10+.
The conntrack/ipfrag backport was previously not entirely consistent in
its include for versions 3.9 and 3.10. The intention was to build it for
all kernels 3.10 and newer, so fix the version checks.
Reported-by: Simon Horman <simon.horman@netronome.com>
Signed-off-by: Joe Stringer <joe@ovn.org>
Acked-by: Pravin B Shelar <pshelar@nicira.com>
Tested-by: Simon Horman <simon.horman@netronome.com>
Diffstat (limited to 'datapath/conntrack.c')
| -rw-r--r-- | datapath/conntrack.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/datapath/conntrack.c b/datapath/conntrack.c index 13a80433c..403d1b424 100644 --- a/datapath/conntrack.c +++ b/datapath/conntrack.c @@ -14,7 +14,7 @@ #include <linux/kconfig.h> #include <linux/version.h> -#if LINUX_VERSION_CODE > KERNEL_VERSION(3,9,0) && \ +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0) && \ IS_ENABLED(CONFIG_NF_CONNTRACK) #include <linux/module.h> @@ -798,4 +798,4 @@ void ovs_ct_exit(struct net *net) nf_connlabels_put(net); } -#endif /* CONFIG_NF_CONNTRACK && LINUX > 3.9 */ +#endif /* CONFIG_NF_CONNTRACK && LINUX > 3.10 */ |