From 4dfb8f1393b8301cb3506ff0ea834bfcc7a8f0ed Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Fri, 17 Dec 2010 08:23:50 -0800 Subject: [PATCH] refresh (create temporary patch) --- meta | 5 +++-- patches/refresh-temp | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 patches/refresh-temp diff --git a/meta b/meta index d25da92..92665cc 100644 --- a/meta +++ b/meta @@ -1,8 +1,9 @@ Version: 1 -Previous: 8016c45e42492274b63f9c063aae7620286dc812 -Head: a2a153cc98530448753152015454816591ed4cea +Previous: 56e6dc8a765a3b02431f94324efe087c76a29e8b +Head: 5384d59b76d95a26c02ad32a65b66f1e2fd0be69 Applied: lmc: b355854c79a1e446e87684a41663ad5aae258b73 lid: a2a153cc98530448753152015454816591ed4cea + refresh-temp: 5384d59b76d95a26c02ad32a65b66f1e2fd0be69 Unapplied: Hidden: diff --git a/patches/refresh-temp b/patches/refresh-temp new file mode 100644 index 0000000..6e4334d --- /dev/null +++ b/patches/refresh-temp @@ -0,0 +1,40 @@ +Bottom: 68adc0c9d48fa548f1cc79f409dba0cfd472afd3 +Top: 0521f515611c9dfa8079c17afc73d25f9482957a +Author: Sean Hefty +Date: 2010-12-17 08:23:50 -0800 + +Refresh of lid + +--- + +diff --git a/src/acm.c b/src/acm.c +index ce30afc..c21cc4c 100644 +--- a/src/acm.c ++++ b/src/acm.c +@@ -273,7 +273,7 @@ acm_format_name(int level, char *name, size_t name_size, + ntohs(path->slid), ntohs(path->dlid)); + } else { + acm_format_name(level, name, name_size, ACM_ADDRESS_GID, +- &path->dgid.raw, sizeof path->dgid); ++ path->dgid.raw, sizeof path->dgid); + } + break; + case ACM_ADDRESS_LID: +@@ -2131,7 +2131,7 @@ acm_svr_resolve_path(struct acm_client *client, struct acm_resolve_msg *msg) + } + + acm_format_name(2, log_data, sizeof log_data, +- ACM_EP_INFO_PATH, path, sizeof *path); ++ ACM_EP_INFO_PATH, msg->data[0].info.addr, sizeof *path); + acm_log(2, "path %s\n", log_data); + ep = acm_get_ep(&msg->data[0]); + if (!ep) { +@@ -2139,7 +2139,7 @@ acm_svr_resolve_path(struct acm_client *client, struct acm_resolve_msg *msg) + return acm_client_resolve_resp(client, msg, NULL, ACM_STATUS_ESRCADDR); + } + +- addr = &msg->data[1].info.addr; ++ addr = msg->data[1].info.addr; + memset(addr, 0, ACM_MAX_ADDRESS); + if (path->dlid) { + * ((uint16_t *) addr) = path->dlid; -- 2.41.0