Fixing QP initialization stuff.

This commit was SVN r18650.

ompi/mca/btl/openib/btl_openib.c

@@ -209,7 +209,7 @@ static int create_srq(mca_btl_openib_module_t *openib_btl)
         if(!BTL_OPENIB_QP_TYPE_PP(qp)) {
             attr.attr.max_wr = mca_btl_openib_component.qp_infos[qp].rd_num +
                 mca_btl_openib_component.qp_infos[qp].u.srq_qp.sd_max;
-            attr.attr.max_sge = mca_btl_openib_component.ib_sg_list_size;
+            attr.attr.max_sge = 1;
             openib_btl->qps[qp].u.srq_qp.rd_posted = 0;
 #if HAVE_XRC
             if(BTL_OPENIB_QP_TYPE_XRC(qp)) {

ompi/mca/btl/openib/connect/btl_openib_connect_ibcm.c

@@ -788,8 +788,12 @@ static int qp_create_one(mca_btl_base_endpoint_t* endpoint, int qp,
     init_attr.recv_cq = openib_btl->hca->ib_cq[qp_cq_prio(qp)];
     init_attr.srq = srq;
     init_attr.cap.max_send_sge = mca_btl_openib_component.ib_sg_list_size;
-    init_attr.cap.max_recv_sge = mca_btl_openib_component.ib_sg_list_size;
-    init_attr.cap.max_recv_wr = max_recv_wr;
+    init_attr.cap.max_recv_sge = 1; /* we do not use SG list */
+    if(BTL_OPENIB_QP_TYPE_PP(qp)) {
+        init_attr.cap.max_recv_wr = max_recv_wr;
+    } else {
+        init_attr.cap.max_recv_wr = 0;
+    }
     init_attr.cap.max_send_wr = max_send_wr;
 
     my_qp = ibv_create_qp(openib_btl->hca->ib_pd, &init_attr); 

ompi/mca/btl/openib/connect/btl_openib_connect_oob.c

@@ -423,8 +423,12 @@ static int qp_create_one(mca_btl_base_endpoint_t* endpoint, int qp,
     init_attr.recv_cq = openib_btl->hca->ib_cq[qp_cq_prio(qp)];
     init_attr.srq     = srq;
     init_attr.cap.max_send_sge = mca_btl_openib_component.ib_sg_list_size;
-    init_attr.cap.max_recv_sge = mca_btl_openib_component.ib_sg_list_size;
-    init_attr.cap.max_recv_wr  = max_recv_wr;
+    init_attr.cap.max_recv_sge = 1; /* we do not use SG list */
+    if(BTL_OPENIB_QP_TYPE_PP(qp)) {
+        init_attr.cap.max_recv_wr  = max_recv_wr;
+    } else {
+        init_attr.cap.max_recv_wr  = 0;
+    }
     init_attr.cap.max_send_wr  = max_send_wr;
 
     my_qp = ibv_create_qp(openib_btl->hca->ib_pd, &init_attr); 

ompi/mca/btl/openib/connect/btl_openib_connect_rdmacm.c

@@ -234,7 +234,7 @@ static int rdmacm_setup_qp(rdmacm_contents_t *local,
     attr.cap.max_recv_wr = max_recv_wr;
     attr.cap.max_send_wr = max_send_wr;
     attr.cap.max_send_sge = mca_btl_openib_component.ib_sg_list_size;
-    attr.cap.max_recv_sge = mca_btl_openib_component.ib_sg_list_size;
+    attr.cap.max_recv_sge = 1; /* we do not use SG list */
 
     qp = ibv_create_qp(local->openib_btl->hca->ib_pd, &attr);
     if (NULL == qp) {

ompi/mca/btl/openib/connect/btl_openib_connect_xoob.c

@@ -394,7 +394,7 @@ static int xoob_send_qp_create (mca_btl_base_endpoint_t* endpoint)
 
     qp_init_attr.cap.max_send_sge = mca_btl_openib_component.ib_sg_list_size;
     /* this one is ignored by driver */
-    qp_init_attr.cap.max_recv_sge = mca_btl_openib_component.ib_sg_list_size;
+    qp_init_attr.cap.max_recv_sge = 1; /* we do not use SG list */
     qp_init_attr.qp_type = IBV_QPT_XRC;
     qp_init_attr.xrc_domain = openib_btl->hca->xrc_domain;
     *qp = ibv_create_qp(openib_btl->hca->ib_pd, &qp_init_attr);