From patchwork Tue Nov 24 16:59:41 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "De Lara Guarch, Pablo" X-Patchwork-Id: 9091 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 4CDDC9191; Tue, 24 Nov 2015 17:59:50 +0100 (CET) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by dpdk.org (Postfix) with ESMTP id A08E88E85 for ; Tue, 24 Nov 2015 17:59:48 +0100 (CET) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP; 24 Nov 2015 08:59:45 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,338,1444719600"; d="scan'208";a="858518808" Received: from sie-lab-214-036.ir.intel.com (HELO sie-lab-214-174.ir.intel.com) ([10.237.214.36]) by orsmga002.jf.intel.com with ESMTP; 24 Nov 2015 08:59:43 -0800 From: Pablo de Lara To: dev@dpdk.org Date: Tue, 24 Nov 2015 16:59:41 +0000 Message-Id: <1448384381-203269-1-git-send-email-pablo.de.lara.guarch@intel.com> X-Mailer: git-send-email 2.5.0 MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH] kni: fix compile issue on Ubuntu 12.04 with kernel 3.13.0-30 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Fixes following error when Ubuntu 12.04 uses kernel 3.13.0-30-generic, since skb_set_hash() is implemented in the kernel from 3.13.0-30, which is declared as UBUNTU_KERNEL_VERSION(3,13,0,30,0) and not UBUNTU_KERNEL_VERSION(3,13,0,30,54) In file included from /usr/src/linux-headers-3.13.0-30-generic/include/linux/if_ether.h:23:0, from /tmp/dpdk/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_osdep.h:39, from /tmp/dpdk/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_hw.h:31, from /tmp/dpdk/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_api.h:31, from /tmp/dpdk/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_mbx.h:31, from /tmp/dpdk/x86_64-native-linuxapp-gcc/build/lib/librte_eal/linuxapp/kni/e1000_mbx.c:28: /usr/src/linux-headers-3.13.0-30-generic/include/linux/skbuff.h:740:1: note: previous definition of ‘skb_set_hash’ was here skb_set_hash(struct sk_buff *skb, __u32 hash, enum pkt_hash_types type) ^ Fixes: e88c3b0a ("kni: fix build on Ubuntu 12.04.5") Signed-off-by: Pablo de Lara --- lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h b/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h index 5f45b8b..68a3b9f 100644 --- a/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h +++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h @@ -3864,7 +3864,7 @@ static inline struct sk_buff *__kc__vlan_hwaccel_put_tag(struct sk_buff *skb, #if ( LINUX_VERSION_CODE < KERNEL_VERSION(3,14,0) ) #if (!(RHEL_RELEASE_CODE && RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(6,6))) -#if (!(UBUNTU_KERNEL_CODE >= UBUNTU_KERNEL_VERSION(3,13,0,30,54) \ +#if (!(UBUNTU_KERNEL_CODE >= UBUNTU_KERNEL_VERSION(3,13,0,30,0) \ && (UBUNTU_RELEASE_CODE == UBUNTU_RELEASE_VERSION(12,4) \ || UBUNTU_RELEASE_CODE == UBUNTU_RELEASE_VERSION(14,4)))) #if (!(SLE_VERSION_CODE == SLE_VERSION(12,0,0)))