refresh

diff --git a/meta b/meta
index 92665cc9eb2462cf47135ef717778c9880d066a6..591d993b5c005077f74d4f3a9fe65962b4df0357 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 56e6dc8a765a3b02431f94324efe087c76a29e8b
-Head: 5384d59b76d95a26c02ad32a65b66f1e2fd0be69
+Previous: c13c2196e8395f00ccc6f3e0bb4a6e36301326a0
+Head: bd554dd512feafe72fc6e7acda00702ec7cea744
 Applied:
   lmc: b355854c79a1e446e87684a41663ad5aae258b73
-  lid: a2a153cc98530448753152015454816591ed4cea
-  refresh-temp: 5384d59b76d95a26c02ad32a65b66f1e2fd0be69
+  lid: bd554dd512feafe72fc6e7acda00702ec7cea744
 Unapplied:
 Hidden:

diff --git a/patches/lid b/patches/lid
index c9422bc56b988314a33e33bd0234fe12fd954327..48dd72eed213249f6593c5713730a80cb4dc7792 100644 (file)
--- a/patches/lid
+++ b/patches/lid
@@ -1,5 +1,5 @@
 Bottom: b2af32a606dc3c3e64f150250320dc7d52426926
-Top:    68adc0c9d48fa548f1cc79f409dba0cfd472afd3
+Top:    0521f515611c9dfa8079c17afc73d25f9482957a
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-12-13 10:35:40 -0800
 
@@ -14,7 +14,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/acm.c b/src/acm.c
-index e0f0b94..ce30afc 100644
+index e0f0b94..c21cc4c 100644
 --- a/src/acm.c
 +++ b/src/acm.c
 @@ -268,8 +268,13 @@ acm_format_name(int level, char *name, size_t name_size,
@@ -28,7 +28,7 @@ index e0f0b94..ce30afc 100644
 +                              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:
@@ -332,7 +332,7 @@ index e0f0b94..ce30afc 100644
 +      }
 +
 +      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) {
@@ -340,7 +340,7 @@ index e0f0b94..ce30afc 100644
 +              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;

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 6e4334d..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,40 +0,0 @@
-Bottom: 68adc0c9d48fa548f1cc79f409dba0cfd472afd3
-Top:    0521f515611c9dfa8079c17afc73d25f9482957a
-Author: Sean Hefty <sean.hefty@intel.com>
-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;