[dpdk-stable] [PATCH 18.11] kni: fix ethtool build error on kernel 5.7

Kevin Traynor ktraynor at redhat.com
Wed Sep 2 10:55:08 CEST 2020


On 28/08/2020 13:39, Luca Boccassi wrote:
> 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().
>>
>> Add compatability for this as it is used for igb.
>>
>> Signed-off-by: Kevin Traynor <ktraynor at redhat.com>
>> ---
>>  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_ */
> 
> Acked-by: Luca Boccassi <bluca at debian.org>
> 

Thanks Luca, applied.



More information about the stable mailing list