refresh (create temporary patch)

diff --git a/meta b/meta
index 02b559d418f961a0b7f63552712308ef0c6fafeb..8a448ac37e63ac8f6a4546467772976a8bc6c8ba 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 0e232094252148e83b84091d72e29da0d9eed0a1
-Head: 0efcd3f8ce35505db956def43fed116866073b1b
+Previous: 299e94ec0345710fc25dd8e9a5bcea52c63ee7b0
+Head: f59a167484203ce96487e33cb7f9aa7d9086bcf3
 Applied:
   lmc: b355854c79a1e446e87684a41663ad5aae258b73
   lid: 1c005908ee6c257f6fa290df8ce8a45e968d07ab
@@ -8,5 +8,6 @@ Applied:
   range: dfe3c8409e2e1fcc2fc11bd7f9287f1c46b36015
   format_lid: 8994e17d78c86c08edcc8067dda7392a97cc8a3f
   query_path: 0efcd3f8ce35505db956def43fed116866073b1b
+  refresh-temp: f59a167484203ce96487e33cb7f9aa7d9086bcf3
 Unapplied:
 Hidden:

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..30ca42d
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,49 @@
+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: