From ec96e6637630d33301540993509c5b037b3c422d Mon Sep 17 00:00:00 2001 From: Pravin B Shelar Date: Fri, 18 Sep 2015 15:23:21 -0700 Subject: [PATCH] datapath: Fix compilation on kernel 3.18 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Fixes following compilation error: In file included from ovs/datapath/linux/actions.c:30: ovs/datapath/linux/compat/include/linux/if_vlan.h:65: error: redefinition of ‘__vlan_hwaccel_push_inside’ include/linux/if_vlan.h:353: note: previous definition of ‘__vlan_hwaccel_push_inside’ was here ovs/datapath/linux/compat/include/linux/if_vlan.h:83: Signed-off-by: Pravin B Shelar Acked-by: Jesse Gross --- .travis.yml | 2 +- acinclude.m4 | 1 + datapath/linux/compat/include/linux/if_vlan.h | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index f4b9188ae..c721f53a3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,7 @@ env: - KERNEL=4.0.9 - KERNEL=3.17.7 DPDK=1 - KERNEL=3.17.7 DPDK=1 OPTS="--enable-shared" - - KERNEL=3.17.7 + - KERNEL=3.18.21 - KERNEL=3.16.7 - KERNEL=3.14.27 - KERNEL=3.12.35 diff --git a/acinclude.m4 b/acinclude.m4 index beb320b45..df3e75e7a 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -323,6 +323,7 @@ AC_DEFUN([OVS_CHECK_LINUX_COMPAT], [ OVS_GREP_IFELSE([$KSRC/include/linux/etherdevice.h], [ether_addr_copy]) OVS_GREP_IFELSE([$KSRC/include/linux/if_vlan.h], [vlan_set_encap_proto]) + OVS_GREP_IFELSE([$KSRC/include/linux/if_vlan.h], [vlan_hwaccel_push_inside]) OVS_GREP_IFELSE([$KSRC/include/linux/in.h], [ipv4_is_multicast]) OVS_GREP_IFELSE([$KSRC/include/linux/in.h], [proto_ports_offset]) diff --git a/datapath/linux/compat/include/linux/if_vlan.h b/datapath/linux/compat/include/linux/if_vlan.h index 05c287622..060bb62ba 100644 --- a/datapath/linux/compat/include/linux/if_vlan.h +++ b/datapath/linux/compat/include/linux/if_vlan.h @@ -52,7 +52,8 @@ static inline struct sk_buff *rpl_vlan_insert_tag_set_proto(struct sk_buff *skb, } #endif -#if LINUX_VERSION_CODE < KERNEL_VERSION(3,19,0) +#ifndef HAVE_VLAN_HWACCEL_PUSH_INSIDE + /* * __vlan_hwaccel_push_inside - pushes vlan tag to the payload * @skb: skbuff to tag -- 2.20.1