Version: 1
-Previous: af73b7a261da7cdf3ee59686bc22afc28c7808ea
-Head: c711c5eaa89966c713e587c27f691f2aa9580f89
+Previous: 418b58817f0609b6e189bd3621c0d20abbfd0619
+Head: ea2aea0c9f863d88df21dd8aa214e3983d99e7d3
Applied:
addr_open: 1fd2bfd86e2e2fe78f9d5d6d39aa5502938923f0
open_dev: 4687a6571146acd8d9a1553a96e2e4f7e8318761
- ep_active: 0a7cbd421d61024b64bbc233135f0789dda0df6b
- refresh-temp: c711c5eaa89966c713e587c27f691f2aa9580f89
+ ep_active: ea2aea0c9f863d88df21dd8aa214e3983d99e7d3
Unapplied:
autoaddr: 36281f18de15f2482e21ae1304f2e34e9ecf187d
async_mc: c51c6e84981821b2541daba97cee9a29cd1d3709
Bottom: fb1d0cc95bf413473d6098cbb67824845146864e
-Top: 28bee7f87c687e12ae35f480b9e9d62027ef7e56
+Top: c2eb2f73a26bb1db735a31b311d9902c68afdf8d
Author: Sean Hefty <sean.hefty@intel.com>
Date: 2011-01-20 17:06:28 -0800
---
diff --git a/src/acm.c b/src/acm.c
-index f21f702..1cc91c8 100644
+index f21f702..806b133 100644
--- a/src/acm.c
+++ b/src/acm.c
@@ -294,15 +294,22 @@ static int acm_compare_dest(const void *dest1, const void *dest2)
}
-static void acm_port_join(void *context)
-+static int acm_port_join(struct acm_port *port)
++static void acm_port_join(struct acm_port *port)
{
struct acm_device *dev;
- struct acm_port *port = (struct acm_port *) context;
struct acm_ep *ep;
union ibv_gid port_gid;
DLIST_ENTRY *ep_entry;
-@@ -1494,7 +1500,7 @@ static void acm_port_join(void *context)
- if (ret) {
- acm_log(0, "ERROR - ibv_query_gid %d device %s port %d\n",
- ret, dev->verbs->device->name, port->port_num);
-- return;
-+ return ret;
- }
-
- for (ep_entry = port->ep_list.Next; ep_entry != &port->ep_list;
@@ -1513,33 +1519,6 @@ static void acm_port_join(void *context)
port->port_num);
}
+++ /dev/null
-Bottom: 28bee7f87c687e12ae35f480b9e9d62027ef7e56
-Top: c2eb2f73a26bb1db735a31b311d9902c68afdf8d
-Author: Sean Hefty <sean.hefty@intel.com>
-Date: 2011-01-26 14:04:41 -0800
-
-Refresh of ep_active
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index 1cc91c8..806b133 100644
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -1484,7 +1484,7 @@ out:
- free(umad);
- }
-
--static int acm_port_join(struct acm_port *port)
-+static void acm_port_join(struct acm_port *port)
- {
- struct acm_device *dev;
- struct acm_ep *ep;
-@@ -1500,7 +1500,7 @@ static int acm_port_join(struct acm_port *port)
- if (ret) {
- acm_log(0, "ERROR - ibv_query_gid %d device %s port %d\n",
- ret, dev->verbs->device->name, port->port_num);
-- return ret;
-+ return;
- }
-
- for (ep_entry = port->ep_list.Next; ep_entry != &port->ep_list;