From patchwork Thu Nov 26 14:23:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olivier Matz X-Patchwork-Id: 84585 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id C500EA052A; Thu, 26 Nov 2020 15:24:44 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 2196DC980; Thu, 26 Nov 2020 15:24:42 +0100 (CET) Received: from proxy.6wind.com (host.76.145.23.62.rev.coltfrance.com [62.23.145.76]) by dpdk.org (Postfix) with ESMTP id A2257C93E; Thu, 26 Nov 2020 15:24:39 +0100 (CET) Received: from glumotte.dev.6wind.com. (unknown [10.16.0.195]) by proxy.6wind.com (Postfix) with ESMTP id 74A1749771A; Thu, 26 Nov 2020 15:24:38 +0100 (CET) From: Olivier Matz To: dev@dpdk.org Cc: Ferruh Yigit , Kevin Traynor , stable@dpdk.org, Christophe Grosse Date: Thu, 26 Nov 2020 15:23:45 +0100 Message-Id: <20201126142344.25018-1-olivier.matz@6wind.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH] kni: fix compilation on RHEL 8.3 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" Like what was done for mainline kernel in commit 38ad54f3bc76 ("kni: fix build with Linux 5.6"), a new parameter 'txqueue' has to be added to 'ndo_tx_timeout' ndo on RHEL 8.3 kernel. Cc: stable@dpdk.org Tested-by: Christophe Grosse Signed-off-by: Olivier Matz Tested-by: David Marchand Acked-by: Ferruh Yigit --- kernel/linux/kni/compat.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/kernel/linux/kni/compat.h b/kernel/linux/kni/compat.h index d515b27669..5f65640d5e 100644 --- a/kernel/linux/kni/compat.h +++ b/kernel/linux/kni/compat.h @@ -131,7 +131,9 @@ #define HAVE_IOVA_TO_KVA_MAPPING_SUPPORT #endif -#if KERNEL_VERSION(5, 6, 0) <= LINUX_VERSION_CODE +#if KERNEL_VERSION(5, 6, 0) <= LINUX_VERSION_CODE || \ + (defined(RHEL_RELEASE_CODE) && \ + RHEL_RELEASE_VERSION(8, 3) <= RHEL_RELEASE_CODE) #define HAVE_TX_TIMEOUT_TXQUEUE #endif