Commit b1f19639 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'bnxt_en-fixes' 



Michael Chan says:

====================
bnxt_en: 2 bug fixes.

Two unrelated fixes.  The first one fixes intermittent false TX timeouts
during ring reconfigurations.  The second one fixes a formatting
discrepancy between the stored and the running FW versions.

Please also queue these for -stable.  Thanks.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents d4083d3c db28b6c7

drivers/net/ethernet/broadcom/bnxt/bnxt.c

+2 −1
Original line number Diff line number Diff line
@@ -8856,9 +8856,10 @@ void bnxt_tx_disable(struct bnxt *bp) 
			txr->dev_state = BNXT_DEV_STATE_CLOSING;

		}

	}

	/* Drop carrier first to prevent TX timeout */

	netif_carrier_off(bp->dev);

	/* Stop all TX queues */

	netif_tx_disable(bp->dev);

	netif_carrier_off(bp->dev);

}



void bnxt_tx_enable(struct bnxt *bp)

drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c

+2 −2
Original line number Diff line number Diff line
@@ -472,8 +472,8 @@ static int bnxt_dl_info_get(struct devlink *dl, struct devlink_info_req *req, 
	if (BNXT_PF(bp) && !bnxt_hwrm_get_nvm_cfg_ver(bp, &nvm_cfg_ver)) {

		u32 ver = nvm_cfg_ver.vu32;



		sprintf(buf, "%X.%X.%X", (ver >> 16) & 0xF, (ver >> 8) & 0xF,

			ver & 0xF);

		sprintf(buf, "%d.%d.%d", (ver >> 16) & 0xf, (ver >> 8) & 0xf,

			ver & 0xf);

		rc = bnxt_dl_info_put(bp, req, BNXT_VERSION_STORED,

				      DEVLINK_INFO_VERSION_GENERIC_FW_PSID,

				      buf);