Merge branch 'nfp-fixes'
authorDavid S. Miller <davem@davemloft.net>
Fri, 29 Oct 2021 12:25:32 +0000 (13:25 +0100)
committerDavid S. Miller <davem@davemloft.net>
Fri, 29 Oct 2021 12:25:32 +0000 (13:25 +0100)
commit0f48fb6607ead7caed0eb7f4bd41d720da58525b
tree324f4962baced91ffd5cb09e37ac42f883492a29
parente300a85db1f16a5805033feb56ec1861f02c7b1c
parent17e712c6a1bade9dac02a7bf2b464746faa7e9a0
Merge branch 'nfp-fixes'

Simon Horman says:

====================
nfp: fix bugs caused by adaptive coalesce

this series contains fixes for two bugs introduced when
when adaptive coalesce support was added to the NFP driver in
v5.15 by 9d32e4e7e9e1 ("nfp: add support for coalesce adaptive feature")
====================

Signed-off-by: David S. Miller <davem@davemloft.net>