From d9dcf8352e89b21d6a1aa5528d4ba9cd391802b2 Mon Sep 17 00:00:00 2001
From: Nadezhda Kogteva <nadezhda.kogteva@itseez.com>
Date: Wed, 13 May 2015 11:39:35 +0300
Subject: [PATCH] oob ud: fixed a bug that prevented the work with QoS
 framework (oob_stress_channel test)

---
 orte/mca/oob/ud/oob_ud_recv.c | 2 ++
 orte/mca/oob/ud/oob_ud_req.h  | 2 ++
 orte/mca/oob/ud/oob_ud_send.c | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/orte/mca/oob/ud/oob_ud_recv.c b/orte/mca/oob/ud/oob_ud_recv.c
index afb849d654..fb1e4ef491 100644
--- a/orte/mca/oob/ud/oob_ud_recv.c
+++ b/orte/mca/oob/ud/oob_ud_recv.c
@@ -492,6 +492,8 @@ int mca_oob_ud_recv_match_send (mca_oob_ud_port_t *port, mca_oob_ud_peer_t *peer
     req->req_origin       = msg_hdr->msg_origin;
     req->req_target       = msg_hdr->msg_target;
     req->req_rem_data_len = msg_hdr->msg_data.req.data_len;
+    req->req_channel      = msg_hdr->msg_channel;
+    req->req_seq_num      = msg_hdr->msg_seq_num;
 
     do {
         rc = mca_oob_ud_recv_alloc (req);
diff --git a/orte/mca/oob/ud/oob_ud_req.h b/orte/mca/oob/ud/oob_ud_req.h
index 8fb8bd26af..6764401782 100644
--- a/orte/mca/oob/ud/oob_ud_req.h
+++ b/orte/mca/oob/ud/oob_ud_req.h
@@ -71,6 +71,8 @@ struct mca_oob_ud_msg_hdr_t {
 
     orte_process_name_t msg_origin;
     orte_process_name_t msg_target;
+    int                 msg_channel;
+    int                 msg_seq_num;
 
     uint64_t msg_id;
 
diff --git a/orte/mca/oob/ud/oob_ud_send.c b/orte/mca/oob/ud/oob_ud_send.c
index 5688131e4b..7c800e7651 100644
--- a/orte/mca/oob/ud/oob_ud_send.c
+++ b/orte/mca/oob/ud/oob_ud_send.c
@@ -234,6 +234,8 @@ 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;
     req_msg->hdr->msg_data.req.mtu      = port->mtu;