From: David S. Miller Date: Mon, 19 Jul 2021 15:50:35 +0000 (-0700) Subject: Merge branch 'bnxt_en-fixes' X-Git-Tag: microblaze-v5.16~411^2~29 X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=1dd271d9e55296579e5ff7490346bcb2d7e03db8;p=linux-2.6-microblaze.git Merge branch 'bnxt_en-fixes' Michael Chan says: ==================== bnxt_en: Bug fixes Most of the fixes in this series have to do with error recovery. They include error path handling when the error recovery has to abort, and the rediscovery of capabilities (PTP and RoCE) after firmware reset that may result in capability changes. Two other fixes are to reject invalid ETS settings and to validate VLAN protocol in the RX path. ==================== Signed-off-by: David S. Miller --- 1dd271d9e55296579e5ff7490346bcb2d7e03db8