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

[linux-2.6-block.git] / drivers / infiniband / hw / irdma / verbs.c

diff --git a/drivers/infiniband/hw/irdma/verbs.c b/drivers/infiniband/hw/irdma/verbs.c
index 0b046c061742be140251785f60ac25cff73aa2ba..12704efb7b19a8e7bd5422638617a6cd7f8436eb 100644 (file)
--- a/drivers/infiniband/hw/irdma/verbs.c
+++ b/drivers/infiniband/hw/irdma/verbs.c
@@ -719,7 +719,6 @@ static int irdma_setup_kmode_qp(struct irdma_device *iwdev,
                info->rq_pa + (ukinfo->rq_depth * IRDMA_QP_WQE_MIN_SIZE);
        ukinfo->sq_size = ukinfo->sq_depth >> ukinfo->sq_shift;
        ukinfo->rq_size = ukinfo->rq_depth >> ukinfo->rq_shift;
-       ukinfo->qp_id = iwqp->ibqp.qp_num;
 
        iwqp->max_send_wr = (ukinfo->sq_depth - IRDMA_SQ_RSVD) >> ukinfo->sq_shift;
        iwqp->max_recv_wr = (ukinfo->rq_depth - IRDMA_RQ_RSVD) >> ukinfo->rq_shift;
@@ -944,7 +943,7 @@ static int irdma_create_qp(struct ib_qp *ibqp,
        iwqp->host_ctx.size = IRDMA_QP_CTX_SIZE;
 
        init_info.pd = &iwpd->sc_pd;
-       init_info.qp_uk_init_info.qp_id = iwqp->ibqp.qp_num;
+       init_info.qp_uk_init_info.qp_id = qp_num;
        if (!rdma_protocol_roce(&iwdev->ibdev, 1))
                init_info.qp_uk_init_info.first_sq_wq = 1;
        iwqp->ctx_info.qp_compl_ctx = (uintptr_t)qp;