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 E72F3A04B1 for ; Fri, 28 Aug 2020 14:04:05 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id AB0931C1A3; Fri, 28 Aug 2020 14:04:05 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by dpdk.org (Postfix) with ESMTP id 3F8ED1C1A3 for ; Fri, 28 Aug 2020 14:04:04 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598616243; 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; bh=E7OPazESfHhh5R3BBJ79dm1hv1Rx/Kqgae56fca7hIk=; b=XM2K0TVZQKGwRPgwLzdyQotQY9Y+AwoSVZucb6xMp9mw6H2BeEnDtCZhV0hbiqNzi/7wrF 1dPRRGUeYVRdkCyvT3rt/gLlcpSegZct2JfANn/G90bpi8QQY5l9q5HZFmWD3GibmD+XtL W9buoXOu7RNlRTFb2eOtc3yWGMQ8OIM= 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-100-9d920sykNe63glOEezawRQ-1; Fri, 28 Aug 2020 08:04:01 -0400 X-MC-Unique: 9d920sykNe63glOEezawRQ-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A711A18A2252; Fri, 28 Aug 2020 12:04:00 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 76A56614F9; Fri, 28 Aug 2020 12:03:59 +0000 (UTC) From: Kevin Traynor To: stable@dpdk.org, ferruh.yigit@intel.com Cc: bluca@debian.org, Kevin Traynor Date: Fri, 28 Aug 2020 13:03:43 +0100 Message-Id: <20200828120343.227752-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Subject: [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" >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(). Add compatability for this as it is used for igb. Signed-off-by: Kevin Traynor --- kernel/linux/kni/ethtool/igb/kcompat.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/kernel/linux/kni/ethtool/igb/kcompat.h b/kernel/linux/kni/ethtool/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, __always_unused int type) #endif +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 7, 0)) +#define pci_cleanup_aer_uncorrect_error_status \ + pci_aer_clear_nonfatal_status +#endif + #endif /* _KCOMPAT_H_ */ -- 2.26.2