linux-kernel - Re: linux-next: manual merge of the rdma tree with the rdma-fixes tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20180117125537.06e46610@canb.auug.org.au>
Date:   Wed, 17 Jan 2018 12:55:37 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Doug Ledford <dledford@...hat.com>,
        Jason Gunthorpe <jgg@...lanox.com>
Cc:     Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Daniel Jurgens <danielj@...lanox.com>,
        Leon Romanovsky <leon@...nel.org>
Subject: Re: linux-next: manual merge of the rdma tree with the rdma-fixes
 tree

Hi all,

On Wed, 17 Jan 2018 12:51:45 +1100 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> diff --cc drivers/infiniband/hw/mlx5/qp.c
> index cffe5966aef9,ae36db3d0deb..000000000000
> --- a/drivers/infiniband/hw/mlx5/qp.c
> +++ b/drivers/infiniband/hw/mlx5/qp.c
> @@@ -4361,12 -4674,12 +4674,11 @@@ static void to_rdma_ah_attr(struct mlx5
>   
>   	memset(ah_attr, 0, sizeof(*ah_attr));
>   
> - 	if (!path->port || path->port > MLX5_CAP_GEN(dev, num_ports))
>  -	ah_attr->type = rdma_ah_find_type(&ibdev->ib_dev, path->port);
>  -	rdma_ah_set_port_num(ah_attr, path->port);
>  -	if (rdma_ah_get_port_num(ah_attr) == 0 ||
>  -	    rdma_ah_get_port_num(ah_attr) > ibdev->num_ports)
> ++	if (!path->port || path->port > ibdev->num_ports))

I fixed up the extra ')'.  Sorry about that,

-- 
Cheers,
Stephen Rothwell