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

Merge branch 'bnxt_en-fixes' 



Michael Chan says:

====================
bnxt_en: Bug fixes

This series includes 3 fixes.  The first one fixes a race condition
between devlink reload and SR-IOV configuration.  The second one
fixes a type mismatch warning in devlink fw live patching.  The
last one fixes unwanted OVS TC dmesg error logs when tc-hw-offload is
disabled on bnxt_en.
====================

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

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

+5 −4
Original line number Diff line number Diff line
@@ -360,7 +360,7 @@ bnxt_dl_livepatch_report_err(struct bnxt *bp, struct netlink_ext_ack *extack, 
		NL_SET_ERR_MSG_MOD(extack, "Live patch already applied");

		break;

	default:

		netdev_err(bp->dev, "Unexpected live patch error: %hhd\n", err);

		netdev_err(bp->dev, "Unexpected live patch error: %d\n", err);

		NL_SET_ERR_MSG_MOD(extack, "Failed to activate live patch");

		break;

	}
@@ -441,12 +441,13 @@ static int bnxt_dl_reload_down(struct devlink *dl, bool netns_change, 


	switch (action) {

	case DEVLINK_RELOAD_ACTION_DRIVER_REINIT: {

		if (BNXT_PF(bp) && bp->pf.active_vfs) {

		rtnl_lock();

		if (BNXT_PF(bp) && (bp->pf.active_vfs || bp->sriov_cfg)) {

			NL_SET_ERR_MSG_MOD(extack,

					   "reload is unsupported when VFs are allocated");

					   "reload is unsupported while VFs are allocated or being configured");

			rtnl_unlock();

			return -EOPNOTSUPP;

		}

		rtnl_lock();

		if (bp->dev->reg_state == NETREG_UNREGISTERED) {

			rtnl_unlock();

			return -ENODEV;

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

+1 −1
Original line number Diff line number Diff line
@@ -1868,7 +1868,7 @@ static int bnxt_tc_setup_indr_block_cb(enum tc_setup_type type, 
	struct flow_cls_offload *flower = type_data;

	struct bnxt *bp = priv->bp;



	if (flower->common.chain_index)

	if (!tc_cls_can_offload_and_chain0(bp->dev, type_data))

		return -EOPNOTSUPP;



	switch (type) {