From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 7D1E56A9C for ; Tue, 30 Sep 2014 14:04:00 +0200 (CEST) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP; 30 Sep 2014 05:10:39 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.04,626,1406617200"; d="scan'208";a="598747494" Received: from irvmail001.ir.intel.com ([163.33.26.43]) by fmsmga001.fm.intel.com with ESMTP; 30 Sep 2014 05:10:38 -0700 Received: from sivswdev02.ir.intel.com (sivswdev02.ir.intel.com [10.237.217.46]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id s8UCAc30000669; Tue, 30 Sep 2014 13:10:38 +0100 Received: from sivswdev02.ir.intel.com (localhost [127.0.0.1]) by sivswdev02.ir.intel.com with ESMTP id s8UCAcZ2022999; Tue, 30 Sep 2014 13:10:38 +0100 Received: (from dtmrzglx@localhost) by sivswdev02.ir.intel.com with id s8UCAbiP022995; Tue, 30 Sep 2014 13:10:37 +0100 From: Daniel Mrzyglod To: dev@dpdk.org Date: Tue, 30 Sep 2014 13:10:25 +0100 Message-Id: <1412079025-22840-1-git-send-email-danielx.t.mrzyglod@intel.com> X-Mailer: git-send-email 1.7.4.1 Subject: [dpdk-dev] [PATCH] kni:fix build on Ubuntu 12.04.5 with current HWE 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: , X-List-Received-Date: Tue, 30 Sep 2014 12:04:01 -0000 Recent Ubuntu 12.04.5 LTS is shipped with 3.13.0-36.63 as the only supported kernel. Patch a09b359daca3d8af43dc22a57b34cf317f958236 describe the problem. Signed-off-by: Daniel Mrzyglod --- lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h | 3 ++- 1 file changed, 2 insertions(+), 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 5a06383..65649ae 100644 --- a/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h +++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h @@ -3861,7 +3861,8 @@ 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(7,0))) -#if (!(UBUNTU_RELEASE_CODE == UBUNTU_RELEASE_VERSION(14,4) && UBUNTU_KERNEL_CODE >= UBUNTU_KERNEL_VERSION(3,13,0,30,54))) +#if (!((UBUNTU_RELEASE_CODE == UBUNTU_RELEASE_VERSION(14,4) \ +|| UBUNTU_RELEASE_CODE == UBUNTU_RELEASE_VERSION(12,4)) && UBUNTU_KERNEL_CODE >= UBUNTU_KERNEL_VERSION(3,13,0,30,54))) #ifdef NETIF_F_RXHASH #define PKT_HASH_TYPE_L3 0 static inline void -- 1.7.9.5