From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pa0-f43.google.com (mail-pa0-f43.google.com [209.85.220.43]) by dpdk.org (Postfix) with ESMTP id 6D2EB3F9 for ; Thu, 18 Dec 2014 07:53:23 +0100 (CET) Received: by mail-pa0-f43.google.com with SMTP id kx10so813891pab.2 for ; Wed, 17 Dec 2014 22:53:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:mime-version:content-type :content-transfer-encoding; bh=aM42S+TXCJmj+ljPsUfjU7bClQgDVA2pjE022p4wGLY=; b=GzSqlvzj1NGGcFZTC1Mre+MhIwV5jtg6dBtCHQ/JNKvuY45lv+WPS4HYyR31pWi6jB u7FKqS6BiyabC/Y4EVZonKP6+On5KY+AMh0NpNBuFRs3cRe4ZXpP9ITLoWesvefykt18 tlEW5Md1y2cXUULKzTMFCpcG+cuGbg4roCvRW/tQFyaozNQSlcAyF7du1S/dQes0CWa/ LyjHDgAdL/73tHM2P65I8nqjoMv+0aR+qHvPccHtBh5h1ZTGRfBO5l13cMOC4rY9W4Qa hBfgTGckkzTou42pqgbLm4PAKe+vk8F5tJCEFBJe+5U0IegJLr8cy/eNyOJ/hLxjoYCw XXSw== X-Received: by 10.70.54.161 with SMTP id k1mr815984pdp.110.1418885602370; Wed, 17 Dec 2014 22:53:22 -0800 (PST) Received: from localhost.localdomain ([203.114.244.88]) by mx.google.com with ESMTPSA id pb6sm5788569pbb.13.2014.12.17.22.53.19 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 17 Dec 2014 22:53:21 -0800 (PST) From: Jincheng Miao To: dev@dpdk.org Date: Thu, 18 Dec 2014 14:50:29 +0800 Message-Id: <1418885429-11891-1-git-send-email-jincheng.miao@gmail.com> X-Mailer: git-send-email 1.7.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: barak@saguna.net Subject: [dpdk-dev] [PATCH] kni: fix build for CentOS 6.6 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: Thu, 18 Dec 2014 06:53:23 -0000 >>From CentOS 6.6, function skb_set_hash is introduced, this breaks the previous assumption. So modify RHEL_RELEASE_VERSION from 7.0 to 6.6 to fix build for rte_kni.ko. Related mail from Barak Enat: http://dpdk.org/ml/archives/dev/2014-December/010124.html building error likes: CC [M] /root/dpdk-source/build/build/lib/librte_eal/linuxapp/kni/e1000_82575.o In file included from /root/dpdk-source/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_osdep.h:41, from /root/dpdk-source/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_hw.h:31, from /root/dpdk-source/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_api.h:31, from /root/dpdk-source/build/build/lib/librte_eal/linuxapp/kni/e1000_82575.c:38: /root/dpdk-source/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]: *** [/root/dpdk-source/build/build/lib/librte_eal/linuxapp/kni/e1000_82575.o] Error 1 Signed-off-by: Jincheng Miao --- lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h b/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h 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(struct sk_buff *skb, #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)))) -- 1.7.1