refresh

diff --git a/meta b/meta
index e3e72367d1847d5aa9f3b2b83297af0058462d60..09383aa7b5a73236b33d15ae94ffef8f6e1b230b 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 998153a72e7f7d23863a783585c7d1f4976c923d
-Head: 6d698599b76c3be2977aec7f2c9eee193cf339b6
+Previous: 85d834cded0c48557ea70d3ce952bde53b7dcaa0
+Head: 791453d3481814288d7d9529a4a632ea4570df47
 Applied:
-  af_ib: f88bef4e09db011327fef0c7e585370c185fc53c
-  refresh-temp: 6d698599b76c3be2977aec7f2c9eee193cf339b6
+  af_ib: 791453d3481814288d7d9529a4a632ea4570df47
 Unapplied:
   name2ip: 8e00708e882239292492e13aa51c82042255933c
   addr_size: 8de02c47fbf595132105a7050ad6f755f49f9a7a

diff --git a/patches/af_ib b/patches/af_ib
index 4b31d240493ac64b200246bae22a9d8c6ade2249..818413e51d12daf2ca3ecfe3bfaee024087a4d09 100644 (file)
--- a/patches/af_ib
+++ b/patches/af_ib
@@ -1,5 +1,5 @@
 Bottom: 42e4729a57fa30e42770d8787e4b6b02c7bf2204
-Top:    42e4729a57fa30e42770d8787e4b6b02c7bf2204
+Top:    9c8df4b2d96ca4a90a0a18ba88dbd97646f94a82
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2011-10-03 12:40:16 -0700
 
@@ -10,4 +10,39 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/src/acm.c b/src/acm.c
+index d47f9d6..4cf20ed 100644
+--- a/src/acm.c
++++ b/src/acm.c
+@@ -1745,10 +1745,29 @@ static void acm_svr_accept(void)
+ static int
+ acm_is_path_from_port(struct acm_port *port, struct ibv_path_record *path)
+ {
+-      if (ib_any_gid(&path->sgid)) {
++      union ibv_gid gid;
++      uint8_t i;
++
++      if (!ib_any_gid(&path->sgid)) {
++              return (acm_gid_index(port, &path->sgid) < port->gid_cnt);
++      }
++
++      if (path->slid) {
+               return (port->lid == (ntohs(path->slid) & port->lid_mask));
+       }
+-      return (acm_gid_index(port, &path->sgid) < port->gid_cnt);
++
++      if (acm_gid_index(port, &path->dgid) < port->gid_cnt) {
++              return 1;
++      }
++
++      for (i = 0; i < port->gid_cnt; i++) {
++              ibv_query_gid(port->dev->verbs, port->port_num, i, &gid);
++              if (gid.global.subnet_prefix == path->dgid.global.subnet_prefix)) {
++                      return 1;
++              }
++      }
++
++      return 0;
+ }
+ 
+ static struct acm_ep *

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 1318dc1..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,45 +0,0 @@
-Bottom: 42e4729a57fa30e42770d8787e4b6b02c7bf2204
-Top:    9c8df4b2d96ca4a90a0a18ba88dbd97646f94a82
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2011-11-03 11:25:03 -0700
-
-Refresh of af_ib
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index d47f9d6..4cf20ed 100644
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -1745,10 +1745,29 @@ static void acm_svr_accept(void)
- static int
- acm_is_path_from_port(struct acm_port *port, struct ibv_path_record *path)
- {
--      if (ib_any_gid(&path->sgid)) {
-+      union ibv_gid gid;
-+      uint8_t i;
-+
-+      if (!ib_any_gid(&path->sgid)) {
-+              return (acm_gid_index(port, &path->sgid) < port->gid_cnt);
-+      }
-+
-+      if (path->slid) {
-               return (port->lid == (ntohs(path->slid) & port->lid_mask));
-       }
--      return (acm_gid_index(port, &path->sgid) < port->gid_cnt);
-+
-+      if (acm_gid_index(port, &path->dgid) < port->gid_cnt) {
-+              return 1;
-+      }
-+
-+      for (i = 0; i < port->gid_cnt; i++) {
-+              ibv_query_gid(port->dev->verbs, port->port_num, i, &gid);
-+              if (gid.global.subnet_prefix == path->dgid.global.subnet_prefix)) {
-+                      return 1;
-+              }
-+      }
-+
-+      return 0;
- }
- 
- static struct acm_ep *