diff options
author | Maor Gottlieb <maorg@mellanox.com> | 2016-11-27 08:18:20 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-01-26 02:24:34 -0500 |
commit | 7c8441c89043d9914a441e5589bb76148f1a93da (patch) | |
tree | 55387577e49d95fbdc978c1ab8da38ffdc366d4e | |
parent | dae9f4f144119229e4218f92ec0876549460ed45 (diff) |
IB/mlx5: Assign SRQ type earlier
commit c73b7911de97fad3ab9032a110af48d6ab2da48f upstream.
Move the SRQ type assignment to be before actually using it
in create_srq_user() and in create_srq_kernel() functions.
Fixes: af1ba291c5e4 ('{net, IB}/mlx5: Refactor internal SRQ API')
Signed-off-by: Maor Gottlieb <maorg@mellanox.com>
Reviewed-by: Majd Dibbiny <majd@mellanox.com>
Signed-off-by: Leon Romanovsky <leon@kernel.org>
Signed-off-by: Doug Ledford <dledford@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/infiniband/hw/mlx5/srq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/mlx5/srq.c b/drivers/infiniband/hw/mlx5/srq.c index 3857dbd9c956..729b0696626e 100644 --- a/drivers/infiniband/hw/mlx5/srq.c +++ b/drivers/infiniband/hw/mlx5/srq.c | |||
@@ -282,6 +282,7 @@ struct ib_srq *mlx5_ib_create_srq(struct ib_pd *pd, | |||
282 | mlx5_ib_dbg(dev, "desc_size 0x%x, req wr 0x%x, srq size 0x%x, max_gs 0x%x, max_avail_gather 0x%x\n", | 282 | mlx5_ib_dbg(dev, "desc_size 0x%x, req wr 0x%x, srq size 0x%x, max_gs 0x%x, max_avail_gather 0x%x\n", |
283 | desc_size, init_attr->attr.max_wr, srq->msrq.max, srq->msrq.max_gs, | 283 | desc_size, init_attr->attr.max_wr, srq->msrq.max, srq->msrq.max_gs, |
284 | srq->msrq.max_avail_gather); | 284 | srq->msrq.max_avail_gather); |
285 | in.type = init_attr->srq_type; | ||
285 | 286 | ||
286 | if (pd->uobject) | 287 | if (pd->uobject) |
287 | err = create_srq_user(pd, srq, &in, udata, buf_size); | 288 | err = create_srq_user(pd, srq, &in, udata, buf_size); |
@@ -294,7 +295,6 @@ struct ib_srq *mlx5_ib_create_srq(struct ib_pd *pd, | |||
294 | goto err_srq; | 295 | goto err_srq; |
295 | } | 296 | } |
296 | 297 | ||
297 | in.type = init_attr->srq_type; | ||
298 | in.log_size = ilog2(srq->msrq.max); | 298 | in.log_size = ilog2(srq->msrq.max); |
299 | in.wqe_shift = srq->msrq.wqe_shift - 4; | 299 | in.wqe_shift = srq->msrq.wqe_shift - 4; |
300 | if (srq->wq_sig) | 300 | if (srq->wq_sig) |