refresh

diff --git a/meta b/meta
index f6c407bfc11f6a9fb7da39568dc60bc1ceaa044f..ff5c1932d72db9ba195d63c28f17dee438c2573b 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 90f7d05067ca15f1b7bb27424f7e9074dbe15dd2
-Head: 63a9a9c30dd0de2455d26d6291b173e2c82f6d94
+Previous: b84a92e382e3c729086e77a401ac226d652f5b0a
+Head: 03c383af0899a811e0f491699fc3a88c5708da26
 Applied:
-  sgid: f41f55208635f9c56f53f7e227ecf9dec0ada6df
-  refresh-temp: 63a9a9c30dd0de2455d26d6291b173e2c82f6d94
+  sgid: 03c383af0899a811e0f491699fc3a88c5708da26
 Unapplied:
   v1.1make: 97cdca7d9a0224cc251d4edf06b5425fa9eb4575
   v1.1: ee76313542729235d4ba51aa3d012ea29a996ab8

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 0fe709d..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,32 +0,0 @@
-Bottom: 4df8fa519baf0e24c5af25c6000d5277b1798cff
-Top:    3525e2a39882899413a85b1509cf42c86fd1d38b
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2015-07-29 16:59:27 -0700
-
-Refresh of sgid
-
----
-
-diff --git a/prov/acmp/src/acmp.c b/prov/acmp/src/acmp.c
-index 2b85958..a590058 100644
---- a/prov/acmp/src/acmp.c
-+++ b/prov/acmp/src/acmp.c
-@@ -852,12 +852,16 @@ acmp_record_path_addr(struct acmp_ep *ep, struct acmp_dest *dest,
-       acm_log(2, "%s\n", dest->name);
-       dest->path.pkey = htons(ep->pkey);
-       dest->path.dgid = path->dgid;
--      if (path->slid || !ib_any_gid(&path->sgid)) {
--              dest->path.sgid = path->sgid;
-+      if (path->slid) {
-               dest->path.slid = path->slid;
-       } else {
-               dest->path.slid = htons(ep->port->lid);
-       }
-+      if (!ib_any_gid(&path->sgid)) {
-+              dest->path.sgid = path->sgid;
-+      } else {
-+              dest->path.sgid = ep->mc_dest[0].path.sgid;
-+      }
-       dest->path.dlid = path->dlid;
-       dest->state = ACMP_ADDR_RESOLVED;
- }

diff --git a/patches/sgid b/patches/sgid
index 1c5a93d6b933143c73fa29e89184617caed8867f..e86e37ac90a45475a398dc2b6c7d1010de3394a0 100644 (file)
--- a/patches/sgid
+++ b/patches/sgid
@@ -1,5 +1,5 @@
 Bottom: 4df8fa519baf0e24c5af25c6000d5277b1798cff
-Top:    4df8fa519baf0e24c5af25c6000d5277b1798cff
+Top:    3525e2a39882899413a85b1509cf42c86fd1d38b
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2015-07-29 13:53:32 -0700
 
@@ -18,4 +18,26 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/prov/acmp/src/acmp.c b/prov/acmp/src/acmp.c
+index 2b85958..a590058 100644
+--- a/prov/acmp/src/acmp.c
++++ b/prov/acmp/src/acmp.c
+@@ -852,12 +852,16 @@ acmp_record_path_addr(struct acmp_ep *ep, struct acmp_dest *dest,
+       acm_log(2, "%s\n", dest->name);
+       dest->path.pkey = htons(ep->pkey);
+       dest->path.dgid = path->dgid;
+-      if (path->slid || !ib_any_gid(&path->sgid)) {
+-              dest->path.sgid = path->sgid;
++      if (path->slid) {
+               dest->path.slid = path->slid;
+       } else {
+               dest->path.slid = htons(ep->port->lid);
+       }
++      if (!ib_any_gid(&path->sgid)) {
++              dest->path.sgid = path->sgid;
++      } else {
++              dest->path.sgid = ep->mc_dest[0].path.sgid;
++      }
+       dest->path.dlid = path->dlid;
+       dest->state = ACMP_ADDR_RESOLVED;
+ }