Upgrade to 4.4.50-rt62

[kvmfornfv.git] / kernel / drivers / net / ethernet / mellanox / mlx4 / resource_tracker.c

diff --git a/kernel/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c b/kernel/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
index cad6c44..d314d96 100644 (file)
--- a/kernel/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
+++ b/kernel/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
@@ -3132,7 +3132,7 @@ static int verify_qp_parameters(struct mlx4_dev *dev,
                case QP_TRANS_RTS2RTS:
                case QP_TRANS_SQD2SQD:
                case QP_TRANS_SQD2RTS:
-                       if (slave != mlx4_master_func_num(dev))
+                       if (slave != mlx4_master_func_num(dev)) {
                                if (optpar & MLX4_QP_OPTPAR_PRIMARY_ADDR_PATH) {
                                        port = (qp_ctx->pri_path.sched_queue >> 6 & 1) + 1;
                                        if (dev->caps.port_mask[port] != MLX4_PORT_TYPE_IB)
@@ -3151,6 +3151,7 @@ static int verify_qp_parameters(struct mlx4_dev *dev,
                                        if (qp_ctx->alt_path.mgid_index >= num_gids)
                                                return -EINVAL;
                                }
+                       }
                        break;
                default:
                        break;