refresh

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

diff --git a/patches/af_ib b/patches/af_ib
index 9e2efbca0f44201574a1d86e82d43e6981cff9d0..bb1022e763b5e14cc2d71548561c32b11eba9972 100644 (file)
--- a/patches/af_ib
+++ b/patches/af_ib
@@ -1,5 +1,5 @@
 Bottom: 42e4729a57fa30e42770d8787e4b6b02c7bf2204
-Top:    d2c01a7ab84187b30f61d12efc585521e9d15b09
+Top:    78b9ab843389fc77ab07ece0c8734eac61397903
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2011-10-03 12:40:16 -0700
 
@@ -11,10 +11,26 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/acm.c b/src/acm.c
-index d47f9d6..668d3bf 100644
+index d47f9d6..906c926 100644
 --- a/src/acm.c
 +++ b/src/acm.c
-@@ -1745,10 +1745,29 @@ static void acm_svr_accept(void)
+@@ -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;
+ }
+@@ -1745,10 +1749,29 @@ static void acm_svr_accept(void)
  static int
  acm_is_path_from_port(struct acm_port *port, struct ibv_path_record *path)
  {

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 28872ce..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,29 +0,0 @@
-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;
- }