Better patch from Gleb to do the per-port (endpoint) specification of

whether to use eager RDMA or not

This commit was SVN r13262.

ompi/mca/btl/openib/btl_openib.c

@@ -152,6 +152,8 @@ int mca_btl_openib_add_procs(
         }
             
         endpoint->endpoint_btl = openib_btl;
+        endpoint->use_eager_rdma = openib_btl->hca->use_eager_rdma &
+            mca_btl_openib_component.use_eager_rdma;
         endpoint->subnet_id = openib_btl->port_info.subnet_id; 
         rc = mca_btl_openib_proc_insert(ib_proc, endpoint);
         if(rc != OMPI_SUCCESS) {

ompi/mca/btl/openib/btl_openib.h

@@ -230,8 +230,6 @@ struct mca_btl_openib_module_t {
     mca_btl_base_module_error_cb_fn_t error_cb; /**< error handler */
    
     orte_pointer_array_t *endpoints;
-    /** Whether to use eager RDMA for this module or not */
-    uint8_t use_eager_rdma;
 }; typedef struct mca_btl_openib_module_t mca_btl_openib_module_t;
 
 extern mca_btl_openib_module_t mca_btl_openib_module;

ompi/mca/btl/openib/btl_openib_component.c

@@ -345,8 +345,6 @@ static int init_one_port(opal_list_t *btl_list, mca_btl_openib_hca_t *hca,
             openib_btl->port_num = (uint8_t) port_num;
             openib_btl->lid = lid;
             openib_btl->src_path_bits = lid - ib_port_attr->lid;
-            openib_btl->use_eager_rdma = 
-                hca->use_eager_rdma & mca_btl_openib_component.use_eager_rdma;
             /* store the subnet for multi-nic support */
             openib_btl->port_info.subnet_id = subnet_id;
             openib_btl->port_info.mtu = hca->mtu;
@@ -867,7 +865,6 @@ static int btl_openib_handle_incoming(mca_btl_openib_module_t *openib_btl,
     }
    
     if (!endpoint->eager_rdma_local.base.pval &&
-        endpoint->endpoint_btl->use_eager_rdma &&
             endpoint->use_eager_rdma &&
             BTL_OPENIB_HP_QP == prio &&
             openib_btl->eager_rdma_buffers_count <