From ccb79b963f368da314981d808705d569ec308734 Mon Sep 17 00:00:00 2001 From: George Bosilca Date: Mon, 6 Apr 2009 21:49:52 +0000 Subject: [PATCH] This is the other half of the commit r20946 as I mess them up between two of my testing machines. The fix require both commits! This commit was SVN r20947. The following SVN revision numbers were found above: r20946 --> open-mpi/ompi@e2bb4c9b8fa8ddc7c815f6324f2b7728af00c19a --- ompi/mca/pml/ob1/pml_ob1.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/ompi/mca/pml/ob1/pml_ob1.c b/ompi/mca/pml/ob1/pml_ob1.c index 8ba8a67146..14c690b656 100644 --- a/ompi/mca/pml/ob1/pml_ob1.c +++ b/ompi/mca/pml/ob1/pml_ob1.c @@ -495,7 +495,6 @@ void mca_pml_ob1_process_pending_packets(mca_bml_base_btl_t* bml_btl) pckt->hdr.hdr_ack.hdr_dst_req.pval, pckt->hdr.hdr_ack.hdr_send_offset, pckt->hdr.hdr_common.hdr_flags & MCA_PML_OB1_HDR_FLAGS_NORDMA); - MCA_PML_OB1_PCKT_PENDING_RETURN(pckt); if( OPAL_UNLIKELY(OMPI_ERR_OUT_OF_RESOURCE == rc) ) { OPAL_THREAD_LOCK(&mca_pml_ob1.lock); opal_list_append(&mca_pml_ob1.pckt_pending, @@ -509,7 +508,6 @@ void mca_pml_ob1_process_pending_packets(mca_bml_base_btl_t* bml_btl) pckt->hdr.hdr_fin.hdr_des.pval, pckt->order, pckt->hdr.hdr_fin.hdr_fail); - MCA_PML_OB1_PCKT_PENDING_RETURN(pckt); if( OPAL_UNLIKELY(OMPI_ERR_OUT_OF_RESOURCE == rc) ) { OPAL_THREAD_LOCK(&mca_pml_ob1.lock); opal_list_append(&mca_pml_ob1.pckt_pending,