This fixes trac:2154 - CSUM PML false positive. Needs to go to both cmr:v1.4.2 and cmr:v1.5

This commit was SVN r22590.

The following Trac tickets were found above:
  Ticket 2154 --> https://svn.open-mpi.org/trac/ompi/ticket/2154

ompi/mca/pml/csum/pml_csum_recvreq.c

@@ -1054,17 +1054,6 @@ void mca_pml_csum_recv_req_start(mca_pml_csum_recv_request_t *req)
     if(req->req_recv.req_base.req_peer == OMPI_ANY_SOURCE) {
         frag = recv_req_match_wild(req, &proc);
         queue = &comm->wild_receives;
-#if !OPAL_ENABLE_HETEROGENEOUS_SUPPORT
-        /* As we are in a homogeneous environment we know that all remote
-         * architectures are exactly the same as the local one. Therefore,
-         * we can safely construct the convertor based on the proc
-         * information of rank 0.
-         */
-        if( NULL == frag ) {
-            req->req_recv.req_base.req_proc = ompi_proc_local_proc;
-            prepare_recv_req_converter(req);
-        }
-#endif  /* !OPAL_ENABLE_HETEROGENEOUS_SUPPORT */
     } else {
         proc = &comm->procs[req->req_recv.req_base.req_peer];
         req->req_recv.req_base.req_proc = proc->ompi_proc;

ompi/mca/pml/csum/pml_csum_recvreq.h

@@ -224,12 +224,10 @@ static inline void recv_req_matched(mca_pml_csum_recv_request_t *req,
     opal_atomic_wmb();
 #endif
     if(req->req_recv.req_bytes_packed > 0) {
-#if OPAL_ENABLE_HETEROGENEOUS_SUPPORT
         if(MPI_ANY_SOURCE == req->req_recv.req_base.req_peer) {
             /* non wildcard prepared during post recv */
             prepare_recv_req_converter(req);
         }
-#endif  /* OPAL_ENABLE_HETEROGENEOUS_SUPPORT */
         PERUSE_TRACE_COMM_EVENT(PERUSE_COMM_REQ_XFER_BEGIN,
                 &req->req_recv.req_base, PERUSE_RECV);
     }