Merge branch 'master' of github.com:/linux-rdma/rdma-core

Merge in changes pulled by Leon and Yishai before sending my committed items back upstream and releasing -rc2. Signed-off-by: Doug Ledford <[email protected]>
linux-rdma · Aug 21, 2017 · 7d7f03e · 7d7f03e
2 parents f795d0f + b36d8a1
commit 7d7f03e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/libibverbs/examples/xsrq_pingpong.c b/libibverbs/examples/xsrq_pingpong.c
@@ -825,7 +825,7 @@ static void init(void)
 	ctx.ib_port = 1;
 	ctx.num_clients  = 1;
 	ctx.num_tests = 5;
-	ctx.mtu = IBV_MTU_2048;
+	ctx.mtu = IBV_MTU_1024;
 	ctx.sl = 0;
 	ctx.gidx = -1;
 }

diff --git a/providers/mlx5/mlx5.c b/providers/mlx5/mlx5.c
@@ -678,7 +678,7 @@ static int mlx5dv_get_cq(struct ibv_cq *cq_in,
 	cq_out->cqe_size  = mcq->cqe_sz;
 	cq_out->buf       = mcq->active_buf->buf;
 	cq_out->dbrec     = mcq->dbrec;
-	cq_out->uar	  = mctx->uar;
+	cq_out->uar	  = mctx->uar[0];
 
 	mcq->flags	 |= MLX5_CQ_FLAGS_DV_OWNED;