Commit 04ec94ec authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Ben Hutchings

mlx4: add missing braces in verify_qp_parameters

commit baefd701 upstream.

The implementation of QP paravirtualization back in linux-3.7 included
some code that looks very dubious, and gcc-6 has grown smart enough
to warn about it:

drivers/net/ethernet/mellanox/mlx4/resource_tracker.c: In function 'verify_qp_parameters':
drivers/net/ethernet/mellanox/mlx4/resource_tracker.c:3154:5: error: statement is indented as if it were guarded by... [-Werror=misleading-indentation]
     if (optpar & MLX4_QP_OPTPAR_ALT_ADDR_PATH) {
     ^~
drivers/net/ethernet/mellanox/mlx4/resource_tracker.c:3144:4: note: ...this 'if' clause, but it is not
    if (slave != mlx4_master_func_num(dev))

>From looking at the context, I'm reasonably sure that the indentation
is correct but that it should have contained curly braces from the
start, as the update_gid() function in the same patch correctly does.
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Fixes: 54679e14 ("mlx4: Implement QP paravirtualization and maintain phys_pkey_cache for smp_snoop")
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
parent fc49d04a
...@@ -2886,7 +2886,7 @@ static int verify_qp_parameters(struct mlx4_dev *dev, ...@@ -2886,7 +2886,7 @@ static int verify_qp_parameters(struct mlx4_dev *dev,
case QP_TRANS_RTS2RTS: case QP_TRANS_RTS2RTS:
case QP_TRANS_SQD2SQD: case QP_TRANS_SQD2SQD:
case QP_TRANS_SQD2RTS: 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) { if (optpar & MLX4_QP_OPTPAR_PRIMARY_ADDR_PATH) {
port = (qp_ctx->pri_path.sched_queue >> 6 & 1) + 1; port = (qp_ctx->pri_path.sched_queue >> 6 & 1) + 1;
if (dev->caps.port_mask[port] != MLX4_PORT_TYPE_IB) if (dev->caps.port_mask[port] != MLX4_PORT_TYPE_IB)
...@@ -2905,6 +2905,7 @@ static int verify_qp_parameters(struct mlx4_dev *dev, ...@@ -2905,6 +2905,7 @@ static int verify_qp_parameters(struct mlx4_dev *dev,
if (qp_ctx->alt_path.mgid_index >= num_gids) if (qp_ctx->alt_path.mgid_index >= num_gids)
return -EINVAL; return -EINVAL;
} }
}
break; break;
default: default:
break; break;
......
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