From: Jakub Kicinski <kuba@kernel.org>
Date: Fri, 10 Jun 2022 05:02:42 +0000 (-0700)
Subject: Merge branch 'nfp-fixes-for-v5-19'
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=cd3ff99b93f777ec9fd2844fbcd67ebc3350bb64;p=linux.git

Merge branch 'nfp-fixes-for-v5-19'

Simon Horman says:

====================
nfp: fixes for v5.19

this short series includes two fixes for the NFP driver.

1. Restructure GRE+VLAN flower offload to address a miss match
   between the NIC firmware and driver implementation which
   prevented these features from working in combination.

2. Prevent unnecessary warnings regarding rate limiting support.-
   It is expected that this feature to not _always_ be present
   but this was not taken into account when the code to check
   for this feature was added.
====================

Link: https://lore.kernel.org/r/20220608092901.124780-1-simon.horman@corigine.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---

cd3ff99b93f777ec9fd2844fbcd67ebc3350bb64