From patchwork Wed Dec 17 06:21:59 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jincheng Miao X-Patchwork-Id: 2048 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 38CB77F10; Wed, 17 Dec 2014 07:22:02 +0100 (CET) Received: from mail-oi0-f45.google.com (mail-oi0-f45.google.com [209.85.218.45]) by dpdk.org (Postfix) with ESMTP id BE8A37F07 for ; Wed, 17 Dec 2014 07:22:00 +0100 (CET) Received: by mail-oi0-f45.google.com with SMTP id a141so10709863oig.4 for ; Tue, 16 Dec 2014 22:22:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=3K4xHJhNR+W6rkwnTiKK3RZBkv12iKc0YzsfxuogB2Q=; b=EiPqZ43n4T3lfMoSgwEm6T/PUXx7tYubNV+6H31AL93hcU+EGX8D4wjhkOIWSnSB7N gZqPMIKgCVaTU01+orEDvH5CTOOsKLF4Pq4RklqwVYf2CEKc8gTRIJ22bSEGYeyq9R9j K0/bSSzIwUG26KQlCArvHZ5XIkLQ9jRUsRcP9wVcJYmmi9vXk1nuatT8SLxwSgygeuY8 1EuPsR55motQ6BYMXzqjwPlikxj8abhllAOW6Qe/IwQr2LkB72AxoLvn5UO0ZokPU7Jb HPAFrEfi1pV5RkBN8LAC4+VhAV7SkPwtthQ1UeyQNExgYztiRQRFCgqBFbhV8Lw3ZqYA 0phQ== MIME-Version: 1.0 X-Received: by 10.202.221.4 with SMTP id u4mr14788724oig.71.1418797319993; Tue, 16 Dec 2014 22:21:59 -0800 (PST) Received: by 10.76.113.178 with HTTP; Tue, 16 Dec 2014 22:21:59 -0800 (PST) In-Reply-To: References: Date: Wed, 17 Dec 2014 14:21:59 +0800 Message-ID: From: Jincheng Miao To: Barak Enat Cc: dev@dpdk.org Subject: Re: [dpdk-dev] Building 1.7.1 or 1.8.0-rc4 on latest CentOS 6.6 fails 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" On Tue, Dec 16, 2014 at 11:12 PM, Barak Enat wrote: > Hi > > > > When building 1.7.1 or 1.8.0-rc4 on recent CentOS 6 (6.6) I got this error: > > > > In file included from > /home/makerpm/rpmbuild/BUILD/dpdk-1.8.0/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_osdep.h:41, > > from > /home/makerpm/rpmbuild/BUILD/dpdk-1.8.0/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_hw.h:31, > > from > /home/makerpm/rpmbuild/BUILD/dpdk-1.8.0/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_api.h:31, > > from > /home/makerpm/rpmbuild/BUILD/dpdk-1.8.0/x86_64-native-linuxapp-gcc/build/lib/librte_eal/linuxapp/kni/e1000_82575.c:38: > > /home/makerpm/rpmbuild/BUILD/dpdk-1.8.0/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h:3870: > error: conflicting types for 'skb_set_hash' > > include/linux/skbuff.h:620: note: previous definition of 'skb_set_hash' was > here > > make[8]: *** > [/home/makerpm/rpmbuild/BUILD/dpdk-1.8.0/x86_64-native-linuxapp-gcc/build/lib/librte_eal/linuxapp/kni/e1000_82575.o] > Error 1 > > > > It seems the assumption that skb_set_hash is missing in CentOS prior to > version 7 is not valid anymore. Yes, you are right, this function skb_set_hash is added from Cent 6.6, so some macro should be changed like this: --- --- Regards, Jincheng Miao > > Didn't see a fix of it in trunk or in the patches. > > > > Thanks, > > Barak diff --git a/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h b/lib/librte_eal/ index 3dbc07a..1213cc6 100644 --- a/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h +++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h @@ -3860,7 +3860,7 @@ static inline struct sk_buff *__kc__vlan_hwaccel_put_tag(s #endif /* >= 3.10.0 */ #if ( LINUX_VERSION_CODE < KERNEL_VERSION(3,14,0) ) -#if (!(RHEL_RELEASE_CODE && RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(7,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) \ && (UBUNTU_RELEASE_CODE == UBUNTU_RELEASE_VERSION(12,4) \ || UBUNTU_RELEASE_CODE == UBUNTU_RELEASE_VERSION(14,4))))