Merge tag 'staging-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[linux-drm-fsl-dcu.git] / drivers / staging / lustre / lnet / klnds / o2iblnd / o2iblnd.c

diff --git a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c
index 48454a576b7ad80e43faa3e7be11aa0b089fbb97..4eb24a11b02a33ece27e487c1b1f81e6ceebfb45 100644 (file)
--- a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c
+++ b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c
@@ -648,6 +648,7 @@ kib_conn_t *kiblnd_create_conn(kib_peer_t *peer, struct rdma_cm_id *cmid,
        kib_dev_t *dev;
        struct ib_qp_init_attr *init_qp_attr;
        struct kib_sched_info *sched;
+       struct ib_cq_init_attr cq_attr = {};
        kib_conn_t *conn;
        struct ib_cq *cq;
        unsigned long flags;
@@ -743,10 +744,11 @@ kib_conn_t *kiblnd_create_conn(kib_peer_t *peer, struct rdma_cm_id *cmid,
 
        kiblnd_map_rx_descs(conn);
 
+       cq_attr.cqe = IBLND_CQ_ENTRIES(version);
+       cq_attr.comp_vector = kiblnd_get_completion_vector(conn, cpt);
        cq = ib_create_cq(cmid->device,
                          kiblnd_cq_completion, kiblnd_cq_event, conn,
-                         IBLND_CQ_ENTRIES(version),
-                         kiblnd_get_completion_vector(conn, cpt));
+                         &cq_attr);
        if (IS_ERR(cq)) {
                CERROR("Can't create CQ: %ld, cqe: %d\n",
                       PTR_ERR(cq), IBLND_CQ_ENTRIES(version));