Commit b7834758 authored by Matan Barak's avatar Matan Barak Committed by David S. Miller

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: default avatarMatan Barak <matanb@mellanox.com>
Signed-off-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 311be98a
...@@ -3998,13 +3998,17 @@ int mlx4_UPDATE_QP_wrapper(struct mlx4_dev *dev, int slave, ...@@ -3998,13 +3998,17 @@ int mlx4_UPDATE_QP_wrapper(struct mlx4_dev *dev, int slave,
} }
port = (rqp->sched_queue >> 6 & 1) + 1; port = (rqp->sched_queue >> 6 & 1) + 1;
smac_index = cmd->qp_context.pri_path.grh_mylmc;
err = mac_find_smac_ix_in_slave(dev, slave, port, if (pri_addr_path_mask & (1ULL << MLX4_UPD_QP_PATH_MASK_MAC_INDEX)) {
smac_index, &mac); smac_index = cmd->qp_context.pri_path.grh_mylmc;
if (err) { err = mac_find_smac_ix_in_slave(dev, slave, port,
mlx4_err(dev, "Failed to update qpn 0x%x, MAC is invalid. smac_ix: %d\n", smac_index, &mac);
qpn, smac_index);
goto err_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, err = mlx4_cmd(dev, inbox->dma,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment