pml/ob1: fix some typos that got missed on Dec push

Signed-off-by: Nathan Hjelm <hjelmn@lanl.gov>

Author: hjelmn

ompi/mca/pml/ob1/pml_ob1.c

@@ -20,6 +20,8 @@
  * Copyright (c) 2015      FUJITSU LIMITED.  All rights reserved.
  * Copyright (c) 2018      Sandia National Laboratories
  *                         All rights reserved.
+ * Copyright (c) 2018-2019 Triad National Security, LLC. All rights
+ *                         reseved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -793,7 +795,7 @@ void mca_pml_ob1_process_pending_packets(mca_bml_base_btl_t* bml_btl)
     mca_pml_ob1_pckt_pending_t *pckt;
     int32_t rc, max = (int32_t) opal_list_get_size (&mca_pml_ob1.pckt_pending);
 
-    for (int32_t i = 0; i < max ; +i) {
+    for (int32_t i = 0; i < max ; ++i) {
         mca_bml_base_btl_t *send_dst = NULL;
         OPAL_THREAD_SCOPED_LOCK(&mca_pml_ob1.lock, {
                 pckt = (mca_pml_ob1_pckt_pending_t*)

ompi/mca/pml/ob1/pml_ob1.h

@@ -16,7 +16,7 @@
  *                         reserved.
  * Copyright (c) 2015      Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
- * Copyright (c) 2018      Triad National Security, LLC. All rights
+ * Copyright (c) 2018-2019 Triad National Security, LLC. All rights
  *                         reserved.
  * $COPYRIGHT$
  *
@@ -252,10 +252,12 @@ static inline void mca_pml_ob1_add_to_pending (ompi_proc_t *proc, mca_bml_base_b
     mca_pml_ob1_pckt_pending_t *pckt;
 
     MCA_PML_OB1_PCKT_PENDING_ALLOC(pckt);
-    assert (sizeof (pckt->hdr) <= hdr_size);
+    assert (sizeof (pckt->hdr) >= hdr_size);
     pckt->proc = proc;
     pckt->order = order;
     pckt->hdr_size = hdr_size;
+    pckt->bml_btl = bml_btl;
+    memcpy (&pckt->hdr, hdr, hdr_size);
     OPAL_THREAD_SCOPED_LOCK(&mca_pml_ob1.lock, {
             opal_list_append(&mca_pml_ob1.pckt_pending, &pckt->super.super);
         });

ompi/mca/pml/ob1/pml_ob1_sendreq.c

@@ -19,6 +19,8 @@
  * Copyright (c) 2016      Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * Copyright (c) 2018      FUJITSU LIMITED.  All rights reserved.
+ * Copyright (c) 2018-2019 Triad National Security, LLC. All rights
+ *                         reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -761,11 +763,11 @@ int mca_pml_ob1_send_request_start_rdma( mca_pml_ob1_send_request_t* sendreq,
 
     /* build match header */
     hdr = (mca_pml_ob1_hdr_t *) des->des_segments->seg_addr.pval;
-    if (MCA_PML_OB1_PROC_REQUIRES_EXT_MATCH(sendreq->ob1_proc)) {
+    if (need_ext_match) {
         hdr_rget = &hdr->hdr_ext_rget.hdr_rget;
         mca_pml_ob1_cid_hdr_prepare (&hdr->hdr_cid, sendreq->req_send.req_base.req_comm);
     } else {
-        hdr_rget = &hdr->hdr_ext_rget.hdr_rget;
+        hdr_rget = &hdr->hdr_rget;
     }
 
     /* TODO -- Add support for multiple segments for get */