From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 76853A034E for ; Fri, 5 Jun 2020 20:11:49 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 6D7661BFC1; Fri, 5 Jun 2020 20:11:49 +0200 (CEST) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by dpdk.org (Postfix) with ESMTP id E6FFA1D51B for ; Fri, 5 Jun 2020 20:11:47 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591380706; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=P8KHInlpMvTLgDKoEHyPYKPyIg4VzycPSqsspxQTAwA=; b=MzPBeF+UpoPvBrQzYCgNOsLlDx05EbligEyagSs6LCmbSVgzto8/jlf51qr2BnmORGDtF1 UqkXeTuIpU3JhR5azMAt5IsOmPUPU0UhHrvPbRP37xEzKYb9jqAbFfLIoCuqi2SNIrh7bN pkkEEu95bKfDSASxTApncEWCrZLzK5E= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-162-sLQlFdytNiusYXO8pVo8IQ-1; Fri, 05 Jun 2020 14:11:44 -0400 X-MC-Unique: sLQlFdytNiusYXO8pVo8IQ-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D312E8018AC; Fri, 5 Jun 2020 18:11:43 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.130]) by smtp.corp.redhat.com (Postfix) with ESMTP id C41D910013D5; Fri, 5 Jun 2020 18:11:42 +0000 (UTC) From: Kevin Traynor To: stable@dpdk.org, ferruh.yigit@intel.com Cc: bluca@debian.org, Kevin Traynor Date: Fri, 5 Jun 2020 19:11:29 +0100 Message-Id: <20200605181129.14809-3-ktraynor@redhat.com> In-Reply-To: <20200605181129.14809-1-ktraynor@redhat.com> References: <20200605181129.14809-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] [PATCH 18.11 2/2] kni: fix ethtool pointer type build error X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Build error about incompatbile-pointer-types similar to commit 219bfcc05796 ("kni: fix build with Linux 5.1") seen when building with RHEL 8.2 and ethtool enabled. kernel/linux/kni/ethtool/igb/igb_main.c:2358:18: error: initialization of ‘int (*)... [-Werror=incompatible-pointer-types] .ndo_fdb_add = igb_ndo_fdb_add, ^~~~~~~~~~~~~~~ This is because Linux kernel commit 87b0984ebfab ("net: Add extack argument to ndo_fdb_add()") is backported to RHEL/CentOS since 8.1. Extend the fix in commit 219bfcc05796 ("kni: fix build with Linux 5.1") to cover RHEL/CentOS 8.1 onwards. Signed-off-by: Kevin Traynor --- kernel/linux/kni/ethtool/igb/kcompat.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/kernel/linux/kni/ethtool/igb/kcompat.h b/kernel/linux/kni/ethtool/igb/kcompat.h index adab05aa8a..611a5b7c49 100644 --- a/kernel/linux/kni/ethtool/igb/kcompat.h +++ b/kernel/linux/kni/ethtool/igb/kcompat.h @@ -3955,7 +3955,9 @@ skb_set_hash(struct sk_buff *skb, __u32 hash, __always_unused int type) #endif /* >= 5.0.0 or >= RHEL/CentOS 8.1 */ -#if ( LINUX_VERSION_CODE >= KERNEL_VERSION(5,1,0) ) +#if ((LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0)) \ + || (defined(RHEL_RELEASE_CODE) \ + && (RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(8, 1)))) #define HAVE_NDO_FDB_ADD_EXTACK -#endif /* >= 5.1.0 */ +#endif /* >= 5.1.0 or >= RHEL/CentOS 8.1 */ #if defined(timer_setup) && defined(from_timer) -- 2.21.3