From 01a9bdf4cf74693014d73e5a93b7df31e274638b Mon Sep 17 00:00:00 2001
From: Ralph Castain <rhc@open-mpi.org>
Date: Thu, 30 Apr 2015 07:30:49 -0700
Subject: [PATCH] Cleanup of ud/oob component

---
 orte/mca/oob/ud/oob_ud_req.c  |  9 +++++----
 orte/mca/oob/ud/oob_ud_send.c | 11 ++++++-----
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/orte/mca/oob/ud/oob_ud_req.c b/orte/mca/oob/ud/oob_ud_req.c
index b484ca6523..3018fc75ba 100644
--- a/orte/mca/oob/ud/oob_ud_req.c
+++ b/orte/mca/oob/ud/oob_ud_req.c
@@ -4,7 +4,7 @@
  *                         reserved.
  *               2014      Mellanox Technologies, Inc.
  *                         All rights reserved.
- * Copyright (c) 2015 Intel, Inc.  All rights reserved.
+ * Copyright (c) 2015      Intel, Inc.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -287,10 +287,11 @@ void mca_oob_ud_req_complete (mca_oob_ud_req_t *req, int rc)
     case MCA_OOB_UD_REQ_SEND:
         if (req->req_data_type != MCA_OOB_UD_REQ_TR) {
             req->rml_msg->status = rc;
-            if( NULL == req->rml_msg->channel)
+            if( NULL == req->rml_msg->channel) {
                 ORTE_RML_SEND_COMPLETE(req->rml_msg);
-            else
+            } else {
                 ORTE_QOS_SEND_COMPLETE(req->rml_msg);
+            }
         }
         break;
     case MCA_OOB_UD_REQ_RECV:
@@ -323,7 +324,7 @@ void mca_oob_ud_req_complete (mca_oob_ud_req_t *req, int rc)
             snd->origin =  req->req_origin;
             snd->tag = req->req_tag;
             snd->dst_channel = req->req_channel;
-            snd->seq_num = req->req_seqnum;
+            snd->seq_num = req->req_seq_num;
             if (MCA_OOB_UD_REQ_IOV == req->req_data_type) {
                 char *data = (char *)calloc(req->req_data.iov.count, sizeof(struct iovec));
                 int datalen = 0;
diff --git a/orte/mca/oob/ud/oob_ud_send.c b/orte/mca/oob/ud/oob_ud_send.c
index 645095b17f..fc3ae3db82 100644
--- a/orte/mca/oob/ud/oob_ud_send.c
+++ b/orte/mca/oob/ud/oob_ud_send.c
@@ -4,7 +4,7 @@
  *                         reserved.
  *               2014      Mellanox Technologies, Inc.
  *                         All rights reserved.
- * Copyright (c) 2015 Intel, Inc.  All rights reserved.
+ * Copyright (c) 2015      Intel, Inc.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -108,10 +108,11 @@ static int mca_oob_ud_send_self (orte_rml_send_t *msg)
 
     req->rml_msg->status = ORTE_SUCCESS;
 
-    if( NULL == req->rml_msg->channel)
-        ORTE_RML_SEND_COMPLETE(req->rml_msg->msg);
-    else
-        ORTE_QOS_SEND_COMPLETE(req->rml_msg->msg);
+    if( NULL == req->rml_msg->channel) {
+        ORTE_RML_SEND_COMPLETE(req->rml_msg);
+    } else {
+        ORTE_QOS_SEND_COMPLETE(req->rml_msg);
+    }
 
     return size;
 }