Version: 1
-Previous: 299e94ec0345710fc25dd8e9a5bcea52c63ee7b0
-Head: f59a167484203ce96487e33cb7f9aa7d9086bcf3
+Previous: 498f5216ea85704808375bc12d602777fc61b436
+Head: f26d98116f57bcead2f61462602b4776c12a0aae
Applied:
lmc: b355854c79a1e446e87684a41663ad5aae258b73
lid: 1c005908ee6c257f6fa290df8ce8a45e968d07ab
acme_gid: 160551b2a4bed277f4c81b52ef33a184f43ca783
range: dfe3c8409e2e1fcc2fc11bd7f9287f1c46b36015
format_lid: 8994e17d78c86c08edcc8067dda7392a97cc8a3f
- query_path: 0efcd3f8ce35505db956def43fed116866073b1b
- refresh-temp: f59a167484203ce96487e33cb7f9aa7d9086bcf3
+ query_path: f26d98116f57bcead2f61462602b4776c12a0aae
Unapplied:
Hidden:
Bottom: 51e1d4efb38c4166735d2f14c94b3c842483435a
-Top: bb5c523e3cfc72da4f5964ce6a1c40101d4ac69d
+Top: a8e8aa49b3591176bc809c876eb5943ae719ce0d
Author: Sean Hefty <sean.hefty@intel.com>
Date: 2010-12-17 12:53:43 -0800
---
diff --git a/src/acm.c b/src/acm.c
-index ed1cb28..859b1bc 100644
+index ed1cb28..1f3c470 100644
--- a/src/acm.c
+++ b/src/acm.c
@@ -1722,30 +1722,6 @@ static void acm_svr_accept(void)
+acm_svr_query_path(struct acm_client *client, struct acm_resolve_msg *msg)
{
struct acm_request *req;
-+ struct acm_send_msg *send_msg;
++ struct acm_send_msg *sa_msg;
+ struct ib_sa_mad *mad;
struct acm_ep *ep;
uint8_t status;
- status = acm_svr_query_sa(ep, req);
- if (!status)
- return status;
-+ send_msg = acm_alloc_send(ep, &ep->port->sa_dest, sizeof(*mad));
-+ if (!send_msg) {
++ sa_msg = acm_alloc_send(ep, &ep->port->sa_dest, sizeof(*mad));
++ if (!sa_msg) {
+ acm_log(0, "ERROR - cannot allocate send msg\n");
+ status = ACM_STATUS_ENOMEM;
+ goto free;
+ }
+
-+ acm_init_send_req(send_msg, (void *) req, acm_client_sa_resp);
-+ mad = (struct ib_sa_mad *) send_msg->data;
++ acm_init_send_req(sa_msg, (void *) req, acm_client_sa_resp);
++ mad = (struct ib_sa_mad *) sa_msg->data;
+ acm_init_path_query(mad);
+
+ memcpy(mad->data, &msg->data[0].info.path, sizeof(struct ibv_path_record));
+ mad->comp_mask = acm_path_comp_mask(&msg->data[0].info.path);
+
-+ acm_post_send(&ep->sa_queue, msg);
++ acm_post_send(&ep->sa_queue, sa_msg);
+ return ACM_STATUS_SUCCESS;
+free:
+++ /dev/null
-Bottom: bb5c523e3cfc72da4f5964ce6a1c40101d4ac69d
-Top: a8e8aa49b3591176bc809c876eb5943ae719ce0d
-Author: Sean Hefty <sean.hefty@intel.com>
-Date: 2010-12-17 13:05:46 -0800
-
-Refresh of query_path
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index 859b1bc..1f3c470 100644
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -1783,7 +1783,7 @@ static int
- acm_svr_query_path(struct acm_client *client, struct acm_resolve_msg *msg)
- {
- struct acm_request *req;
-- struct acm_send_msg *send_msg;
-+ struct acm_send_msg *sa_msg;
- struct ib_sa_mad *mad;
- struct acm_ep *ep;
- uint8_t status;
-@@ -1808,21 +1808,21 @@ acm_svr_query_path(struct acm_client *client, struct acm_resolve_msg *msg)
- goto resp;
- }
-
-- send_msg = acm_alloc_send(ep, &ep->port->sa_dest, sizeof(*mad));
-- if (!send_msg) {
-+ sa_msg = acm_alloc_send(ep, &ep->port->sa_dest, sizeof(*mad));
-+ if (!sa_msg) {
- acm_log(0, "ERROR - cannot allocate send msg\n");
- status = ACM_STATUS_ENOMEM;
- goto free;
- }
-
-- acm_init_send_req(send_msg, (void *) req, acm_client_sa_resp);
-- mad = (struct ib_sa_mad *) send_msg->data;
-+ acm_init_send_req(sa_msg, (void *) req, acm_client_sa_resp);
-+ mad = (struct ib_sa_mad *) sa_msg->data;
- acm_init_path_query(mad);
-
- memcpy(mad->data, &msg->data[0].info.path, sizeof(struct ibv_path_record));
- mad->comp_mask = acm_path_comp_mask(&msg->data[0].info.path);
-
-- acm_post_send(&ep->sa_queue, msg);
-+ acm_post_send(&ep->sa_queue, sa_msg);
- return ACM_STATUS_SUCCESS;
-
- free: