refresh

diff --git a/meta b/meta
index e0e6250664faa38d023822335a87d0da92307e2f..6d79cdb77330a02777f0e9c75f5c2f4fa48bb59d 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 6567cef5afb983e2b46e087414bc938258a1ff41
-Head: 8ac78223e8fbf14546da4b655c813f0326d42641
+Previous: 3be7c0f4348519320c08145ea19c16ca76ca8e31
+Head: 1c005908ee6c257f6fa290df8ce8a45e968d07ab
 Applied:
   lmc: b355854c79a1e446e87684a41663ad5aae258b73
-  lid: bd554dd512feafe72fc6e7acda00702ec7cea744
-  refresh-temp: 8ac78223e8fbf14546da4b655c813f0326d42641
+  lid: 1c005908ee6c257f6fa290df8ce8a45e968d07ab
 Unapplied:
 Hidden:

diff --git a/patches/lid b/patches/lid
index 48dd72eed213249f6593c5713730a80cb4dc7792..e753c134fc1941ce74e2989af35fe96bc152d909 100644 (file)
--- a/patches/lid
+++ b/patches/lid
@@ -1,5 +1,5 @@
 Bottom: b2af32a606dc3c3e64f150250320dc7d52426926
-Top:    0521f515611c9dfa8079c17afc73d25f9482957a
+Top:    9cfb1ddbdd89bfe7a45eb80019ef27af2267dd2e
 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..c21cc4c 100644
+index e0f0b94..b4e0632 100644
 --- a/src/acm.c
 +++ b/src/acm.c
 @@ -268,8 +268,13 @@ acm_format_name(int level, char *name, size_t name_size,
@@ -361,7 +361,7 @@ index e0f0b94..c21cc4c 100644
 +              status = ACM_STATUS_SUCCESS;
 +              break;
 +      case ACM_INIT:
-+              acm_log(2, "have path, bypassing address resolution");
++              acm_log(2, "have path, bypassing address resolution\n");
 +              acm_record_path_addr(ep, dest, path);
 +              /* fall through */
 +      case ACM_ADDR_RESOLVED:
@@ -408,3 +408,24 @@ index e0f0b94..c21cc4c 100644
        } else {
                ret = acm_svr_resolve(client, resolve_msg);
        }
+@@ -2582,7 +2717,7 @@ static void acm_init_port(struct acm_port *port)
+                       break;
+       }
+       port->lid = attr.lid;
+-      port->lid_mask = 0xffff - (1 << attr.lmc) - 1;
++      port->lid_mask = 0xffff - ((1 << attr.lmc) - 1);
+ 
+       acm_init_dest(&port->sa_dest, ACM_ADDRESS_LID,
+               (uint8_t *) &attr.sm_lid, sizeof(attr.sm_lid));
+diff --git a/src/acme.c b/src/acme.c
+index a7b7413..dd645c1 100644
+--- a/src/acme.c
++++ b/src/acme.c
+@@ -493,7 +493,7 @@ static int resolve_lid(struct ibv_path_record *path)
+       path->dlid = htons((uint16_t) atoi(dest_addr));
+       path->reversible_numpath = IBV_PATH_RECORD_REVERSIBLE | 1;
+ 
+-      ret = ib_acm_resolve_path(path, 0);
++      ret = ib_acm_resolve_path(path, get_resolve_flags());
+       if (ret)
+               printf("ib_acm_resolve_path failed: %s\n", strerror(errno));

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 700ca75..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,43 +0,0 @@
-Bottom: 0521f515611c9dfa8079c17afc73d25f9482957a
-Top:    9cfb1ddbdd89bfe7a45eb80019ef27af2267dd2e
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-12-17 10:17:02 -0800
-
-Refresh of lid
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index c21cc4c..b4e0632 100644
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -2160,7 +2160,7 @@ acm_svr_resolve_path(struct acm_client *client, struct acm_resolve_msg *msg)
-               status = ACM_STATUS_SUCCESS;
-               break;
-       case ACM_INIT:
--              acm_log(2, "have path, bypassing address resolution");
-+              acm_log(2, "have path, bypassing address resolution\n");
-               acm_record_path_addr(ep, dest, path);
-               /* fall through */
-       case ACM_ADDR_RESOLVED:
-@@ -2717,7 +2717,7 @@ static void acm_init_port(struct acm_port *port)
-                       break;
-       }
-       port->lid = attr.lid;
--      port->lid_mask = 0xffff - (1 << attr.lmc) - 1;
-+      port->lid_mask = 0xffff - ((1 << attr.lmc) - 1);
- 
-       acm_init_dest(&port->sa_dest, ACM_ADDRESS_LID,
-               (uint8_t *) &attr.sm_lid, sizeof(attr.sm_lid));
-diff --git a/src/acme.c b/src/acme.c
-index a7b7413..dd645c1 100644
---- a/src/acme.c
-+++ b/src/acme.c
-@@ -493,7 +493,7 @@ static int resolve_lid(struct ibv_path_record *path)
-       path->dlid = htons((uint16_t) atoi(dest_addr));
-       path->reversible_numpath = IBV_PATH_RECORD_REVERSIBLE | 1;
- 
--      ret = ib_acm_resolve_path(path, 0);
-+      ret = ib_acm_resolve_path(path, get_resolve_flags());
-       if (ret)
-               printf("ib_acm_resolve_path failed: %s\n", strerror(errno));