Changes to support latest mca_ptl_base frag and match

header types

This commit was SVN r3660.

src/mca/ptl/ib/src/ptl_ib.c

@@ -324,7 +324,6 @@ static void mca_ptl_ib_start_ack(mca_ptl_base_module_t *module,
 
     hdr->hdr_common.hdr_type = MCA_PTL_HDR_TYPE_ACK;
     hdr->hdr_common.hdr_flags = 0;
-    hdr->hdr_common.hdr_size = sizeof(mca_ptl_base_ack_header_t);
 
     /* Remote side send descriptor */
     hdr->hdr_ack.hdr_src_ptr =

src/mca/ptl/ib/src/ptl_ib.h

@@ -23,6 +23,7 @@
 
 /* Open MPI includes */
 #include "class/ompi_free_list.h"
+#include "class/ompi_bitmap.h"
 #include "event/event.h"
 #include "mca/pml/pml.h"
 #include "mca/ptl/ptl.h"

src/mca/ptl/ib/src/ptl_ib_sendfrag.c

@@ -64,9 +64,7 @@ int mca_ptl_ib_send_frag_init(mca_ptl_ib_send_frag_t* sendfrag,
     if(offset == 0) { 
         hdr->hdr_common.hdr_type = MCA_PTL_HDR_TYPE_MATCH;
         hdr->hdr_common.hdr_flags = flags;
-        hdr->hdr_common.hdr_size = sizeof(mca_ptl_base_match_header_t);
         hdr->hdr_frag.hdr_frag_offset = offset; 
-        hdr->hdr_frag.hdr_frag_seq = 0;
         hdr->hdr_frag.hdr_src_ptr.lval = 0; /* for VALGRIND/PURIFY - REPLACE WITH MACRO */
 
         /* Ptr to send frag, so incoming ACK can locate the frag */
@@ -86,9 +84,7 @@ int mca_ptl_ib_send_frag_init(mca_ptl_ib_send_frag_t* sendfrag,
 
         hdr->hdr_common.hdr_type = MCA_PTL_HDR_TYPE_FRAG;
         hdr->hdr_common.hdr_flags = flags;
-        hdr->hdr_common.hdr_size = sizeof(mca_ptl_base_frag_header_t);
         hdr->hdr_frag.hdr_frag_offset = offset; 
-        hdr->hdr_frag.hdr_frag_seq = 0;
         hdr->hdr_frag.hdr_src_ptr.lval = 0; /* for VALGRIND/PURIFY - REPLACE WITH MACRO */
         hdr->hdr_frag.hdr_src_ptr.pval = sendfrag;
         hdr->hdr_frag.hdr_dst_ptr = sendreq->req_peer_match;
@@ -350,9 +346,7 @@ int mca_ptl_ib_put_frag_init(mca_ptl_ib_send_frag_t *sendfrag,
 
     hdr->hdr_common.hdr_type = MCA_PTL_HDR_TYPE_FIN;
     hdr->hdr_common.hdr_flags = flags;
-    hdr->hdr_common.hdr_size = sizeof(mca_ptl_base_frag_header_t);
     hdr->hdr_frag.hdr_frag_offset = offset;
-    hdr->hdr_frag.hdr_frag_seq = 0;
     hdr->hdr_frag.hdr_src_ptr.lval = 0;
     hdr->hdr_frag.hdr_src_ptr.pval = sendfrag;
     hdr->hdr_frag.hdr_dst_ptr = req->req_peer_match;