From patchwork Fri Dec 21 06:03:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Zeng X-Patchwork-Id: 49224 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 4928F1BD49; Fri, 21 Dec 2018 07:04:01 +0100 (CET) Received: from mail-pf1-f193.google.com (mail-pf1-f193.google.com [209.85.210.193]) by dpdk.org (Postfix) with ESMTP id 596011BD49 for ; Fri, 21 Dec 2018 07:03:59 +0100 (CET) Received: by mail-pf1-f193.google.com with SMTP id u6so2063266pfh.11 for ; Thu, 20 Dec 2018 22:03:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=Deis1jUsiyES2FxoWNQoDw2aPwsVJFCR/gyf0VckshQ=; b=AiKR0i10qAnang+lOcCWr6bUU99r+m2mqL0jZejL1YLPCu3QgCHuObDsBxex3szCR/ xuWkRS8xDQ8AtE/GoWP73/CgrydbGDXjdsbUgb//JfGthRIRA/qva4Ao5qGDbO+Xs7DO Vb9xqIiFVeJYbLTHBqa09vAxtGHD+6r7UtmRsxVKffJrrU0aEWdnj9K/R9EVQweJxikw peetfdTsWJ16bDbOp1hQSwUD5JC/e9oyQolsw7uJ2oiS3ZCGwDFnTtA7VAWY3VOydXa5 WhflS1ZS0splqZcwIeJU5J4M+ouUxTWlb/206MghSKiguxuMWwZag73pm7rQYLp/hp2G 7dFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=Deis1jUsiyES2FxoWNQoDw2aPwsVJFCR/gyf0VckshQ=; b=Ktec4G9n40dBTYNbAjL5nQd1NdkjhIQtEBkP5W8qiuZM+tt5mNTqul/3DG9bSBscWn plhK524DmDX8wpnBCCSQmUD7YHhrPNftdm8UnT1nGm2FLckf64Euxx/oa5Se1KRSDER4 /ZFp+r0W0x60TtG2uOo0fTrazgI4MgjvzfEbFF9Bh3TsKLURj5BZLDRc2bfsGL0dVB3Y S1fVH1c83MJ3jUAnAYWUzs8hzJDcxDi+ysDxg7AVsrsDIpns0HJeJrg9s3WtOynJGPQY KTQwFgJweIBmO3xKH4srLZW6lEFPx2/FSlEcAFUUunR7ft+cqo1u1ZABHmpnnb8u31xC EH4g== X-Gm-Message-State: AA+aEWbMRmOnOoacAT75SSU0YpOjS1LbI9cUwRoR93jH/KDlomM7dq6H JV+K+dDGHUk4UqY3qzLrFa4KlYP5fhPTdA== X-Google-Smtp-Source: AFSGD/UYG5EiBKG4ZC/yzRZwPEmS8uFA0bZ/PARA1PDNh2ZZc4my8hMnUb9xFyPS36rGDhVn4Pzw/g== X-Received: by 2002:a62:e201:: with SMTP id a1mr1175371pfi.75.1545372238335; Thu, 20 Dec 2018 22:03:58 -0800 (PST) Received: from boston-io2.cn.ibm.com ([153.254.110.20]) by smtp.gmail.com with ESMTPSA id l185sm31681388pfl.54.2018.12.20.22.03.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 20 Dec 2018 22:03:57 -0800 (PST) From: David Zeng X-Google-Original-From: David Zeng To: dev@dpdk.org Cc: David Zeng Date: Fri, 21 Dec 2018 14:03:51 +0800 Message-Id: <1545372231-45810-1-git-send-email-zengxhsh@cn.ibm.com> X-Mailer: git-send-email 1.8.3.1 Subject: [dpdk-dev] [PATCH] kni: fix build on RHEL 7.6-ALT on IBM POWER9 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Signed-off-by: David Zeng --- kernel/linux/kni/compat.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/kernel/linux/kni/compat.h b/kernel/linux/kni/compat.h index 5aadebb..1afa3b8 100644 --- a/kernel/linux/kni/compat.h +++ b/kernel/linux/kni/compat.h @@ -102,8 +102,14 @@ #undef NET_NAME_UNKNOWN #endif +/* + * RHEL has two different version with different kernel version: + * 3.10 is for AMD, Intel, IBM POWER7 and POWER8; + * 4.14 is for ARM and IBM POWER9 + */ #if (defined(RHEL_RELEASE_CODE) && \ - (RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(7, 5))) + (RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(7, 5)) && \ + (LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0))) #define ndo_change_mtu ndo_change_mtu_rh74 #endif