refresh (create temporary patch)

diff --git a/meta b/meta
index 088c6af3f4ad53b6fd9db00b41c3668eaf723776..b87af8934c0cfd87b71f0a060344f9b8f7d2e327 100644 (file)
--- a/meta
+++ b/meta
@@ -1,8 +1,9 @@
 Version: 1
-Previous: 28395fbec285a0ca9834915fcfb918963af91233
-Head: e876ca5cce58c043b8d0e9e5d3db1ed0da7aaeb2
+Previous: 9a9154416deb1e4380411bc320165ade079e4134
+Head: ba9a93bf36a189de0a7b38e590fa46b9435b1e72
 Applied:
   af_ib: e876ca5cce58c043b8d0e9e5d3db1ed0da7aaeb2
+  refresh-temp: ba9a93bf36a189de0a7b38e590fa46b9435b1e72
 Unapplied:
   name2ip: 8e00708e882239292492e13aa51c82042255933c
   addr_size: 8de02c47fbf595132105a7050ad6f755f49f9a7a

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..28872ce
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,29 @@
+Bottom: d2c01a7ab84187b30f61d12efc585521e9d15b09
+Top:    78b9ab843389fc77ab07ece0c8734eac61397903
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2011-11-03 17:13:05 -0700
+
+Refresh of af_ib
+
+---
+
+diff --git a/src/acm.c b/src/acm.c
+index 668d3bf..906c926 100644
+--- a/src/acm.c
++++ b/src/acm.c
+@@ -949,9 +949,13 @@ acm_record_path_addr(struct acm_ep *ep, struct acm_dest *dest,
+ {
+       acm_log(2, "%s\n", dest->name);
+       dest->path.pkey = htons(ep->pkey);
+-      dest->path.sgid = path->sgid;
+       dest->path.dgid = path->dgid;
+-      dest->path.slid = path->slid;
++      if (path->slid || !ib_any_gid(&path->sgid)) {
++              dest->path.sgid = path->sgid;
++              dest->path.slid = path->slid;
++      } else {
++              dest->path.slid = ep->port->lid;
++      }
+       dest->path.dlid = path->dlid;
+       dest->state = ACM_ADDR_RESOLVED;
+ }