From patchwork Fri Sep 18 22:23:21 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pravin B Shelar X-Patchwork-Id: 519599 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from archives.nicira.com (unknown [IPv6:2600:3c00::f03c:91ff:fe6e:bdf7]) by ozlabs.org (Postfix) with ESMTP id 962001401B5 for ; Sat, 19 Sep 2015 08:23:34 +1000 (AEST) Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id 26E8010C23; Fri, 18 Sep 2015 15:23:32 -0700 (PDT) X-Original-To: dev@openvswitch.org Delivered-To: dev@openvswitch.org Received: from mx1e4.cudamail.com (mx1.cudamail.com [69.90.118.67]) by archives.nicira.com (Postfix) with ESMTPS id 96A3710C1F for ; Fri, 18 Sep 2015 15:23:31 -0700 (PDT) Received: from bar2.cudamail.com (unknown [192.168.21.12]) by mx1e4.cudamail.com (Postfix) with ESMTPS id 2C4711E07D1 for ; Fri, 18 Sep 2015 16:23:30 -0600 (MDT) X-ASG-Debug-ID: 1442615009-03dc537fe3290d00001-byXFYA Received: from mx1-pf2.cudamail.com ([192.168.24.2]) by bar2.cudamail.com with ESMTP id ItPPFDIMM0FqacEz (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Fri, 18 Sep 2015 16:23:29 -0600 (MDT) X-Barracuda-Envelope-From: pshelar@nicira.com X-Barracuda-RBL-Trusted-Forwarder: 192.168.24.2 Received: from unknown (HELO mail-pa0-f42.google.com) (209.85.220.42) by mx1-pf2.cudamail.com with ESMTPS (RC4-SHA encrypted); 18 Sep 2015 22:23:29 -0000 Received-SPF: unknown (mx1-pf2.cudamail.com: Multiple SPF records returned) X-Barracuda-RBL-Trusted-Forwarder: 209.85.220.42 Received: by pacex6 with SMTP id ex6so61759381pac.0 for ; Fri, 18 Sep 2015 15:23:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-type:content-transfer-encoding; bh=aj+wbv968QTczmHC2gGdoLePI6Ih37T2M6R7feWGLLA=; b=kPDXsPEjYq5Rq1P+JZB3NRzn8yoGeAm7EC410KLErUsWaRNYNxPhKc6mG21CvHshId vJXQzx+Z4Ik7hDr7sdiVpT3sp/Hdewf65wjE7IbXsgBDgwjsURkrXlERnUKU9rmKOgcA bfXHgR96ZScpulI8mL6glqhinZLCd6D0OaxUmVYTenxQpRWPkze73OpZMBEzddHmzCwX IoGnjRRnUiB4xhhG6mo56EvTopPwfk4kDhvpPqHbrs2a3KmtmBbwbBO9qSZSKDvePcs7 en7ToPX6BDe6lSi3UOQLIpCsjxPICUxcDb3OG8dyO/t7d1gsYEP3CwObQ+uvd9gXdqBM vE/g== X-Gm-Message-State: ALoCoQnod2zZUvJsVtQlsqObseVW8gFvWSjNrU2+YOk4mLvmMIXHo4bAvnyrxs7Uu8cOj1cQOTdW X-Received: by 10.68.110.132 with SMTP id ia4mr9482717pbb.165.1442615008482; Fri, 18 Sep 2015 15:23:28 -0700 (PDT) Received: from localhost ([208.91.1.34]) by smtp.gmail.com with ESMTPSA id uc1sm10874989pab.20.2015.09.18.15.23.27 (version=TLSv1.1 cipher=RC4-SHA bits=128/128); Fri, 18 Sep 2015 15:23:27 -0700 (PDT) X-CudaMail-Envelope-Sender: pshelar@nicira.com X-Barracuda-Apparent-Source-IP: 208.91.1.34 From: Pravin B Shelar To: dev@openvswitch.org X-CudaMail-Whitelist-To: dev@openvswitch.org X-CudaMail-MID: CM-E2-917083232 X-CudaMail-DTE: 091815 X-CudaMail-Originating-IP: 209.85.220.42 Date: Fri, 18 Sep 2015 15:23:21 -0700 X-ASG-Orig-Subj: [##CM-E2-917083232##][PATCH 1/3] datapath: Fix compilation on kernel 3.18 Message-Id: <1442615001-2339-1-git-send-email-pshelar@nicira.com> X-Mailer: git-send-email 1.7.1 MIME-Version: 1.0 X-Barracuda-Connect: UNKNOWN[192.168.24.2] X-Barracuda-Start-Time: 1442615009 X-Barracuda-Encrypted: DHE-RSA-AES256-SHA X-Barracuda-URL: https://web.cudamail.com:443/cgi-mod/mark.cgi X-ASG-Whitelist: Header =?UTF-8?B?eFwtY3VkYW1haWxcLXdoaXRlbGlzdFwtdG8=?= X-Virus-Scanned: by bsmtpd at cudamail.com X-Barracuda-BRTS-Status: 1 Subject: [ovs-dev] [PATCH 1/3] datapath: Fix compilation on kernel 3.18 X-BeenThere: dev@openvswitch.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@openvswitch.org Sender: "dev" 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 f4b9188..c721f53 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 beb320b..df3e75e 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 05c2876..060bb62 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