From b45dfb413172cab689d28bdcbb37f70d82394eb4 Mon Sep 17 00:00:00 2001
From: Sean Hefty <sean.hefty@intel.com>
Date: Wed, 29 Jul 2015 16:59:27 -0700
Subject: [PATCH] refresh (create temporary patch)

---
 meta                 |  5 +++--
 patches/refresh-temp | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 patches/refresh-temp

diff --git a/meta b/meta
index 1d9612b..f6c407b 100644
--- a/meta
+++ b/meta
@@ -1,8 +1,9 @@
 Version: 1
-Previous: 9b11c328af0cc377e7868a12046557b5f78162fb
-Head: f41f55208635f9c56f53f7e227ecf9dec0ada6df
+Previous: 90f7d05067ca15f1b7bb27424f7e9074dbe15dd2
+Head: 63a9a9c30dd0de2455d26d6291b173e2c82f6d94
 Applied:
   sgid: f41f55208635f9c56f53f7e227ecf9dec0ada6df
+  refresh-temp: 63a9a9c30dd0de2455d26d6291b173e2c82f6d94
 Unapplied:
   v1.1make: 97cdca7d9a0224cc251d4edf06b5425fa9eb4575
   v1.1: ee76313542729235d4ba51aa3d012ea29a996ab8
diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644
index 0000000..0fe709d
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,32 @@
+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;
+ }
-- 
2.46.0