IB/ehca: Fix AQP0/1 QP number

AQP0/1 should report qp_num={0|1} and the actual QP# should be stored
in struct ehca_qp, not the other way round.

Signed-off-by: Joachim Fenkes <fenkes@de.ibm.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>

1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/infiniband/hw/ehca/ehca_qp.c b/drivers/infiniband/hw/ehca/ehca_qp.c
index e21d79684057..b5bc787c77b6 100644
--- a/drivers/infiniband/hw/ehca/ehca_qp.c
+++ b/drivers/infiniband/hw/ehca/ehca_qp.c
@@ -523,6 +523,8 @@ struct ib_qp *ehca_create_qp(struct ib_pd *pd,
                 goto create_qp_exit1;
         }
 
+        my_qp->ib_qp.qp_num = my_qp->real_qp_num;
+
         switch (init_attr->qp_type) {
         case IB_QPT_RC:
                 if (isdaqp == 0) {
@@ -568,7 +570,7 @@ struct ib_qp *ehca_create_qp(struct ib_pd *pd,
                         parms.act_nr_recv_wqes = init_attr->cap.max_recv_wr;
                         parms.act_nr_send_sges = init_attr->cap.max_send_sge;
                         parms.act_nr_recv_sges = init_attr->cap.max_recv_sge;
-                        my_qp->real_qp_num =
+                        my_qp->ib_qp.qp_num =
                                 (init_attr->qp_type == IB_QPT_SMI) ? 0 : 1;
                 }
 
@@ -595,7 +597,6 @@ struct ib_qp *ehca_create_qp(struct ib_pd *pd,
         my_qp->ib_qp.recv_cq = init_attr->recv_cq;
         my_qp->ib_qp.send_cq = init_attr->send_cq;
 
-        my_qp->ib_qp.qp_num = my_qp->real_qp_num;
         my_qp->ib_qp.qp_type = init_attr->qp_type;
 
         my_qp->qp_type = init_attr->qp_type;