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 8A81EA04B1 for ; Fri, 28 Aug 2020 14:39:13 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 7B4A21C1AB; Fri, 28 Aug 2020 14:39:13 +0200 (CEST) Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by dpdk.org (Postfix) with ESMTP id E61031C1AB for ; Fri, 28 Aug 2020 14:39:12 +0200 (CEST) Received: by mail-wm1-f67.google.com with SMTP id a65so782315wme.5 for ; Fri, 28 Aug 2020 05:39:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:subject:from:to:date:in-reply-to :references:content-transfer-encoding:user-agent:mime-version; bh=I03GOlzr794zFz1M7E4lzSj6UWeF5pY6DlzrxTp6cGM=; b=AzmL0AVIo2236GB+y+xW22YfL+P3wjrEQN3dwxTolrEMfX65aa2G65TvN9/B30/LKb 7JEtHdOXuhvkvoLQUj7vxV0odOxXGxXL6x+qq9G9ePT2lcfGRyHbyYhAqr2yHr1w5KjV cco1LlHkIIrfuh23hlciEj+QPWGtye8KoqVbvt93qus/ZkPMjx7STPPMa9Qxr8msUf0a owb78h3xqipSpzMhlS9Ebn2rPLRhLVkP86tcFVgsUb00Yl5/RckzzRakdHgz6S5aDXaO Xwdbggd1I7XH44sAEQ/hL1xM+36EcSJYpw+z8IVJV3+il6V4B0WxP0HwRuKA7NSm+BK6 W7lg== X-Gm-Message-State: AOAM531VcmoATm98o3dRtvM7UW+iSu85nl1OIXBHQoSrQNaLMt07rUIu OfiDIjFd5aD+kFSsa0nSkE0= X-Google-Smtp-Source: ABdhPJwEbUVLnERnU2icCsqPmch3Glaf/9aI/c698HJO0Vdrb9b7x+J4l1WJrTatkWtnT/bFrvYXng== X-Received: by 2002:a7b:c84f:: with SMTP id c15mr1502958wml.133.1598618352682; Fri, 28 Aug 2020 05:39:12 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id a85sm2198573wmd.26.2020.08.28.05.39.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Aug 2020 05:39:11 -0700 (PDT) Message-ID: <951b51c5a29bb759db4b8df928331c0bb831d15d.camel@debian.org> From: Luca Boccassi To: Kevin Traynor , stable@dpdk.org, ferruh.yigit@intel.com Date: Fri, 28 Aug 2020 13:39:11 +0100 In-Reply-To: <20200828120343.227752-1-ktraynor@redhat.com> References: <20200828120343.227752-1-ktraynor@redhat.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.30.5-1.1 MIME-Version: 1.0 Subject: Re: [dpdk-stable] [PATCH 18.11] kni: fix ethtool build error on kernel 5.7 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" On Fri, 2020-08-28 at 13:03 +0100, Kevin Traynor wrote: > From Linux kernel 5.7 onwards, commit > 894020fdd88c ("PCI/AER: Rationalize error status register clearing") > replaces pci_cleanup_aer_uncorrect_error_status() with > pci_aer_clear_nonfatal_status(). >=20 > Add compatability for this as it is used for igb. >=20 > Signed-off-by: Kevin Traynor > --- > kernel/linux/kni/ethtool/igb/kcompat.h | 5 +++++ > 1 file changed, 5 insertions(+) >=20 > diff --git a/kernel/linux/kni/ethtool/igb/kcompat.h b/kernel/linux/kni/et= htool/igb/kcompat.h > index 611a5b7c49..f74038b3eb 100644 > --- a/kernel/linux/kni/ethtool/igb/kcompat.h > +++ b/kernel/linux/kni/ethtool/igb/kcompat.h > @@ -3965,3 +3965,8 @@ skb_set_hash(struct sk_buff *skb, __u32 hash, __alw= ays_unused int type) > #endif > =20 > +#if (LINUX_VERSION_CODE >=3D KERNEL_VERSION(5, 7, 0)) > +#define pci_cleanup_aer_uncorrect_error_status \ > + pci_aer_clear_nonfatal_status > +#endif > + > #endif /* _KCOMPAT_H_ */ Acked-by: Luca Boccassi --=20 Kind regards, Luca Boccassi