Commit b7834758 authored Sep 10, 2014 by Matan Barak Committed by David S. Miller Sep 10, 2014

net/mlx4: Avoid dealing with MAC index in UPDATE_QP wrapper if not needed



The current wrapper implementation of the UPDATE_QP command tries to get
the MAC index, even if MAC wasn't set by the VF. Fix it up to only handle
the MAC field if it's valid.

Fixes: ce8d9e0d ('net/mlx4_core: Add UPDATE_QP SRIOV wrapper support')
Signed-off-by: Matan Barak <matanb@mellanox.com>
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 311be98a

drivers/net/ethernet/mellanox/mlx4/resource_tracker.c

+11 −7

Original line number	Diff line number	Diff line
		@@ -3998,14 +3998,18 @@ int mlx4_UPDATE_QP_wrapper(struct mlx4_dev *dev, int slave,
		}

		port = (rqp->sched_queue >> 6 & 1) + 1;

		if (pri_addr_path_mask & (1ULL << MLX4_UPD_QP_PATH_MASK_MAC_INDEX)) {
		smac_index = cmd->qp_context.pri_path.grh_mylmc;
		err = mac_find_smac_ix_in_slave(dev, slave, port,
		smac_index, &mac);

		if (err) {
		mlx4_err(dev, "Failed to update qpn 0x%x, MAC is invalid. smac_ix: %d\n",
		qpn, smac_index);
		goto err_mac;
		}
		}

		err = mlx4_cmd(dev, inbox->dma,
		vhcr->in_modifier, 0,