]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commit
mlx4: add missing braces in verify_qp_parameters
authorArnd Bergmann <arnd@arndb.de>
Mon, 14 Mar 2016 14:18:34 +0000 (15:18 +0100)
committerTim Gardner <tim.gardner@canonical.com>
Thu, 21 Apr 2016 13:20:28 +0000 (07:20 -0600)
commit0af2688f0191f977330ffd74700976cd56bf4911
tree4b7f75daaa31a725035a3827b2a5aa5c3407e95a
parent9cae02347e36332e38541ef2673cbddd6862fa17
mlx4: add missing braces in verify_qp_parameters

BugLink: http://bugs.launchpad.net/bugs/1573034
[ Upstream commit baefd7015cdb304ce6c94f9679d0486c71954766 ]

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: 54679e148287 ("mlx4: Implement QP paravirtualization and maintain phys_pkey_cache for smp_snoop")
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
drivers/net/ethernet/mellanox/mlx4/resource_tracker.c