refresh (create temporary patch)

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

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