commit

diff --git a/meta b/meta
index a9038323ea004228e75b6aca53931fb44faa100d..471363feafc9b00561faa28c72c727a26c2b9b12 100644 (file)
--- a/meta
+++ b/meta
@@ -1,8 +1,7 @@
 Version: 1
-Previous: 9a6548fd6354f6b234747acd5d2b36d2062c17d6
+Previous: e291d485f6a0d39b554ab9991d03042fae2a07ae
 Head: d0c3b92fea66953c1797e09b21103719a80f1135
 Applied:
-  acmp-specify-sgid-in-pr-query: 03c383af0899a811e0f491699fc3a88c5708da26
   add-missing-ibacm_prov-man: d0c3b92fea66953c1797e09b21103719a80f1135
 Unapplied:
   v1.1: abae5d0f24b0639b60a38861c3324536b3b96d5b

diff --git a/patches/acmp-specify-sgid-in-pr-query b/patches/acmp-specify-sgid-in-pr-query
deleted file mode 100644 (file)
index e86e37a..0000000
--- a/patches/acmp-specify-sgid-in-pr-query
+++ /dev/null
@@ -1,43 +0,0 @@
-Bottom: 4df8fa519baf0e24c5af25c6000d5277b1798cff
-Top:    3525e2a39882899413a85b1509cf42c86fd1d38b
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2015-07-29 13:53:32 -0700
-
-acmp: Specify SGID in PR query
-
-If a PR query is issued with the DGID set, but the SGID not set,
-then opensm version 3.3.19 (and likely others) will return a PR
-with the SGID set to that of the SM.  This appears to be a bug
-with the SM, as an SLID is provided.
-
-In order to be safe, specify the SGID with the PR query, so that
-we get a PR that's usable.
-
-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;
- }