Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma

[linux-2.6-block.git] / drivers / infiniband / hw / mlx5 / cq.c

diff --git a/drivers/infiniband/hw/mlx5/cq.c b/drivers/infiniband/hw/mlx5/cq.c
index cca1820802b81f6e890e2e141fe0a7cbbe9a15ad..7d769b5538b4a275796dcfd8b7545152239667f5 100644 (file)
--- a/drivers/infiniband/hw/mlx5/cq.c
+++ b/drivers/infiniband/hw/mlx5/cq.c
@@ -874,6 +874,7 @@ static int create_cq_user(struct mlx5_ib_dev *dev, struct ib_udata *udata,
                cq->private_flags |= MLX5_IB_CQ_PR_FLAGS_CQE_128_PAD;
        }
 
+       MLX5_SET(create_cq_in, *cqb, uid, to_mucontext(context)->devx_uid);
        return 0;
 
 err_cqb:
@@ -1454,7 +1455,7 @@ ex:
        return err;
 }
 
-int mlx5_ib_get_cqe_size(struct mlx5_ib_dev *dev, struct ib_cq *ibcq)
+int mlx5_ib_get_cqe_size(struct ib_cq *ibcq)
 {
        struct mlx5_ib_cq *cq;