mlx4: add missing braces in verify_qp_parameters
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: Arnd Bergmann <arnd@arndb.de>
Fixes: 54679e1482
("mlx4: Implement QP paravirtualization and maintain phys_pkey_cache for smp_snoop")
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
916848ca6f
commit
baefd7015c
|
@ -3141,7 +3141,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)
|
||||
|
@ -3160,6 +3160,7 @@ static int verify_qp_parameters(struct mlx4_dev *dev,
|
|||
if (qp_ctx->alt_path.mgid_index >= num_gids)
|
||||
return -EINVAL;
|
||||
}
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
|
|
Loading…
Reference in New Issue