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 9d32e4e7

 ("nfp: add support for coalesce adaptive feature")
====================

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