From a31292abc7023b065ed09ef55d64889bebad2011 Mon Sep 17 00:00:00 2001
From: Anandhi S Jayakumar <anandhi.s.jayakumar@intel.com>
Date: Thu, 10 Mar 2016 18:03:17 -0800
Subject: [PATCH] fixes to ud for removing qos channel

---
 orte/mca/oob/ud/oob_ud_req.c  | 10 ++--------
 orte/mca/oob/ud/oob_ud_send.c |  8 --------
 orte/mca/rml/base/base.h      |  1 +
 3 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/orte/mca/oob/ud/oob_ud_req.c b/orte/mca/oob/ud/oob_ud_req.c
index 3018fc75ba..4e804a1e9e 100644
--- a/orte/mca/oob/ud/oob_ud_req.c
+++ b/orte/mca/oob/ud/oob_ud_req.c
@@ -287,11 +287,6 @@ 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) {
-                ORTE_RML_SEND_COMPLETE(req->rml_msg);
-            } else {
-                ORTE_QOS_SEND_COMPLETE(req->rml_msg);
-            }
         }
         break;
     case MCA_OOB_UD_REQ_RECV:
@@ -307,10 +302,10 @@ void mca_oob_ud_req_complete (mca_oob_ud_req_t *req, int rc)
                     memcpy (&data[datalen], req->req_data.iov.uiov[i].iov_base, req->req_data.iov.uiov[i].iov_len);
                     datalen += req->req_data.iov.uiov[i].iov_len;
                 }
-                ORTE_RML_POST_MESSAGE(&req->req_origin, req->req_tag, req->req_channel, req->req_seq_num, data, datalen);
+                ORTE_RML_POST_MESSAGE(&req->req_origin, req->req_tag, req->req_seq_num, data, datalen);
                 free(data);
             } else {
-                ORTE_RML_POST_MESSAGE(&req->req_origin, req->req_tag, req->req_channel, req->req_seq_num,
+                ORTE_RML_POST_MESSAGE(&req->req_origin, req->req_tag, req->req_seq_num,
                                       req->req_data.buf.p, req->req_data.buf.size);
             }
         } else {
@@ -323,7 +318,6 @@ void mca_oob_ud_req_complete (mca_oob_ud_req_t *req, int rc)
             snd->dst = req->req_target;
             snd->origin =  req->req_origin;
             snd->tag = req->req_tag;
-            snd->dst_channel = req->req_channel;
             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));
diff --git a/orte/mca/oob/ud/oob_ud_send.c b/orte/mca/oob/ud/oob_ud_send.c
index 7c800e7651..28883f55f2 100644
--- a/orte/mca/oob/ud/oob_ud_send.c
+++ b/orte/mca/oob/ud/oob_ud_send.c
@@ -107,12 +107,6 @@ 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);
-    } else {
-        ORTE_QOS_SEND_COMPLETE(req->rml_msg);
-    }
-
     return size;
 }
 
@@ -166,7 +160,6 @@ int mca_oob_ud_process_send_nb(int fd, short args, void *cbdata)
     send_req->req_target = op->msg->dst;
     send_req->req_origin = op->msg->origin;
     send_req->req_tag    = op->msg->tag;
-    send_req->req_channel = op->msg->dst_channel;
     send_req->req_seq_num  = op->msg->seq_num;
 
     if (op->msg->data != NULL) {
@@ -234,7 +227,6 @@ int mca_oob_ud_process_send_nb(int fd, short args, void *cbdata)
 
     req_msg->hdr->msg_origin   = op->msg->origin;
     req_msg->hdr->msg_target   = op->msg->dst;
-    req_msg->hdr->msg_channel  = op->msg->dst_channel;
     req_msg->hdr->msg_seq_num  = op->msg->seq_num;
 
     req_msg->hdr->msg_data.req.data_len = size;
diff --git a/orte/mca/rml/base/base.h b/orte/mca/rml/base/base.h
index 024e9ca2b9..09bf61e7d8 100644
--- a/orte/mca/rml/base/base.h
+++ b/orte/mca/rml/base/base.h
@@ -258,6 +258,7 @@ OBJ_CLASS_DECLARATION(orte_rml_recv_request_t);
         OBJ_RELEASE(m);                                                 \
     }while(0);
 
+#define ORTE_RML_INVALID_CHANNEL_NUM  UINT32_MAX
 /* common implementations */
 ORTE_DECLSPEC void orte_rml_base_post_recv(int sd, short args, void *cbdata);
 ORTE_DECLSPEC void orte_rml_base_process_msg(int fd, short flags, void *cbdata);