Small update.

This commit was SVN r3674.

src/mca/ptl/gm/src/ptl_gm.c

@@ -470,7 +470,6 @@ mca_ptl_gm_matched( mca_ptl_base_module_t * ptl,
     ptl->ptl_recv_progress( ptl, request, bytes_recv, bytes_recv ); 
     
     /* Now update the status of the fragment */
-    ((mca_ptl_gm_recv_frag_t*)frag)->matched = true;
     if( ((mca_ptl_gm_recv_frag_t*)frag)->have_allocated_buffer == true ) {
         free( ((mca_ptl_gm_recv_frag_t*)frag)->frag_recv.frag_base.frag_addr);
         ((mca_ptl_gm_recv_frag_t*)frag)->have_allocated_buffer = false;

src/mca/ptl/gm/src/ptl_gm_priv.c

@@ -103,10 +103,7 @@ int mca_ptl_gm_peer_send( mca_ptl_gm_peer_t *ptl_peer,
         if((rc = ompi_convertor_pack(convertor, &(iov), &in_size, &max_data, &freeAfter)) < 0)
             return OMPI_ERROR;
     }
-
-    if( (header->hdr_common.hdr_type == MCA_PTL_HDR_TYPE_FRAG) ||
-	(header->hdr_common.hdr_type == MCA_PTL_HDR_TYPE_MATCH) )
-	header->hdr_match.hdr_msg_length = iov.iov_len;
+    header->hdr_match.hdr_msg_length = iov.iov_len;
 
     /* adjust size and request offset to reflect actual number of bytes
      * packed by convertor
@@ -176,7 +173,7 @@ int mca_ptl_gm_peer_send( mca_ptl_gm_peer_t *ptl_peer,
          * is easier to implement.
          */
         gm_status_t status;
-        mca_ptl_gm_rdv_header_t* header;
+        mca_ptl_gm_rdv_header_t* header = (mca_ptl_gm_rdv_header_t*)fragment->send_buf;
 
         status = gm_register_memory( ptl_peer->peer_ptl->gm_port,
                                      sendreq->req_base.req_addr,

src/mca/ptl/gm/src/ptl_gm_sendfrag.c

@@ -75,9 +75,10 @@ mca_ptl_gm_alloc_send_frag( struct mca_ptl_gm_module_t *ptl,
     OMPI_FREE_LIST_WAIT( &(ptl->gm_send_frags), item, rc );
     sendfrag = (mca_ptl_gm_send_frag_t *)item;
     /* And then get some DMA memory to put the data */
+    OMPI_FREE_LIST_WAIT( &(ptl->gm_send_dma_frags), item, rc );
     ompi_atomic_sub( &(ptl->num_send_tokens), 1 );
     assert( ptl->num_send_tokens >= 0 );
-    OMPI_FREE_LIST_WAIT( &(ptl->gm_send_dma_frags), item, rc );
+
     sendfrag->send_buf = (void*)item;
 
     sendfrag->req = (struct mca_pml_base_send_request_t *)sendreq;