openvswitch: fix conditions for Linux 4.14

Condition testing for Linux version 4.14 is spelled LINUX_4_14, not
LINUX_4.14, so the checks were ineffective up to this change.
This Fixes the following error which appeared after update to 2.12.0,
when built against kernel 4.14:
Package kmod-openvswitch-intree is missing dependencies for the
following libraries:
tunnel6.ko

Signed-off-by: Lech Perczak <redacted>

diff --git a/net/openvswitch/Makefile b/net/openvswitch/Makefile
index ee03c78fe63d92cb83669f7f2fb8796747c5b75b..819e0a34d62a4a1ff0e682ffedd9d415d977c2a0 100644 (file)
--- a/net/openvswitch/Makefile
+++ b/net/openvswitch/Makefile
@@ -75,8 +75,8 @@ ovs_kmod_openvswitch_depends:=\
          +IPV6:kmod-nf-nat6 \
          +kmod-nf-conntrack \
          +IPV6:kmod-nf-conntrack6 \
-         +(!LINUX_4_9&&!LINUX_4.14):kmod-nsh \
-         +(!LINUX_4_9&&!LINUX_4.14):kmod-ipt-conntrack-extra \
+         +(!LINUX_4_9&&!LINUX_4_14):kmod-nsh \
+         +(!LINUX_4_9&&!LINUX_4_14):kmod-ipt-conntrack-extra \
 
 ovs_kmod_openvswitch_files:=$(ovs_kmod_upstream_dir)/openvswitch.ko
 $(eval $(call OvsKmodPackageTemplate,openvswitch))
@@ -120,11 +120,11 @@ ovs_kmod_openvswitch-intree_depends:=\
          +kmod-nf-nat \
          +IPV6:kmod-nf-nat6 \
          +kmod-nf-conntrack \
-         +(IPV6&&(LINUX_4_9||LINUX_4.14)):kmod-nf-conntrack6 \
-         +(LINUX_4_9||LINUX_4.14):kmod-gre \
-         +(IPV6&&(LINUX_4_9||LINUX_4.14)):kmod-gre6 \
-         +(!LINUX_4_9&&!LINUX_4.14):kmod-udptunnel4 \
-         +(!LINUX_4_9&&!LINUX_4.14):kmod-ipt-conntrack-extra \
+         +(IPV6&&(LINUX_4_9||LINUX_4_14)):kmod-nf-conntrack6 \
+         +(LINUX_4_9||LINUX_4_14):kmod-gre \
+         +(IPV6&&(LINUX_4_9||LINUX_4_14)):kmod-gre6 \
+         +(!LINUX_4_9&&!LINUX_4_14):kmod-udptunnel4 \
+         +(!LINUX_4_9&&!LINUX_4_14):kmod-ipt-conntrack-extra \
 
 ovs_kmod_openvswitch-intree_files:= $(ovs_kmod_intree_dir)/openvswitch.ko
 $(eval $(call OvsKmodPackageTemplate,openvswitch-intree))