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. Edwin Peer (1): bnxt_en: reject ETS settings that will starve a TC Kalesh AP (1): bnxt_en: don't disable an already disabled PCI device Michael Chan (5): bnxt_en: Refresh RoCE capabilities in bnxt_ulp_probe() bnxt_en: Add missing check for BNXT_STATE_ABORT_ERR in bnxt_fw_rset_task() bnxt_en: Validate vlan protocol ID on RX packets bnxt_en: Move bnxt_ptp_init() to bnxt_open() bnxt_en: Fix PTP capability discovery Somnath Kotur (2): bnxt_en: fix error path of FW reset bnxt_en: Check abort error state in bnxt_half_open_nic() drivers/net/ethernet/broadcom/bnxt/bnxt.c | 85 ++++++++++++++----- drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c | 10 ++- drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c | 24 ++---- drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.h | 1 - drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c | 9 +- 5 files changed, 83 insertions(+), 46 deletions(-) -- 2.18.1