From 43493032bc6b8f2f3a318955a24863cd61235cdf Mon Sep 17 00:00:00 2001
From: Sean Hefty <sean.hefty@intel.com>
Date: Mon, 4 Jun 2012 11:41:27 -0700
Subject: [PATCH] refresh

---
 meta                 |  7 +++----
 patches/acm-nosrc    | 18 ++++++++++++++++--
 patches/refresh-temp | 24 ------------------------
 3 files changed, 19 insertions(+), 30 deletions(-)
 delete mode 100644 patches/refresh-temp

diff --git a/meta b/meta
index 698df88..33fe227 100644
--- a/meta
+++ b/meta
@@ -1,11 +1,10 @@
 Version: 1
-Previous: 263de4b9bd73e7eb52f13225321b75c98a544717
-Head: ddfc4485230463f5fceb9369a159026ce7ee2a14
+Previous: f7fd40d6cca9e8c311d96e5c09ce6cf947d0560a
+Head: 4477d4c37b88fe0b7cb2da8ab2e1a304b55cc9af
 Applied:
   subnet-timeout: ac94bb084f01f868389017d3940d4b74190d9387
   acme-src: a2f73a11cb993f084a923693c1ffb48239c84a78
-  acm-nosrc: 68b7f66acb800c0fe9c373b7ba954dafc329aa48
-  refresh-temp: ddfc4485230463f5fceb9369a159026ce7ee2a14
+  acm-nosrc: 4477d4c37b88fe0b7cb2da8ab2e1a304b55cc9af
 Unapplied:
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c
   dev-addrsize: 8de02c47fbf595132105a7050ad6f755f49f9a7a
diff --git a/patches/acm-nosrc b/patches/acm-nosrc
index f3e90dc..55539b1 100644
--- a/patches/acm-nosrc
+++ b/patches/acm-nosrc
@@ -1,5 +1,5 @@
 Bottom: 6ae9d02b5c42dfe3869d0fdec73f76daed1d7a8e
-Top:    6ae9d02b5c42dfe3869d0fdec73f76daed1d7a8e
+Top:    78ca90872b59d2bf13ed187c2e8dfffa458d5528
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-06-04 11:38:54 -0700
 
@@ -14,4 +14,18 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/src/acm.c b/src/acm.c
+index c940df3..7891788 100644
+--- a/src/acm.c
++++ b/src/acm.c
+@@ -1762,6 +1762,10 @@ acm_is_path_from_port(struct acm_port *port, struct ibv_path_record *path)
+ 		return (port->lid == (ntohs(path->slid) & port->lid_mask));
+ 	}
+ 
++	if (ib_any_gid(&path->dgid)) {
++		return 1;
++	}
++
+ 	if (acm_gid_index(port, &path->dgid) < port->gid_cnt) {
+ 		return 1;
+ 	}
diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644
index 2407a8d..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,24 +0,0 @@
-Bottom: 6ae9d02b5c42dfe3869d0fdec73f76daed1d7a8e
-Top:    78ca90872b59d2bf13ed187c2e8dfffa458d5528
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-06-04 11:41:26 -0700
-
-Refresh of acm-nosrc
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index c940df3..7891788 100644
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -1762,6 +1762,10 @@ acm_is_path_from_port(struct acm_port *port, struct ibv_path_record *path)
- 		return (port->lid == (ntohs(path->slid) & port->lid_mask));
- 	}
- 
-+	if (ib_any_gid(&path->dgid)) {
-+		return 1;
-+	}
-+
- 	if (acm_gid_index(port, &path->dgid) < port->gid_cnt) {
- 		return 1;
- 	}
-- 
2.46.0