commit

diff --git a/meta b/meta
index 201a6d9d0cc105368129d1e60bfdcdfdb21eb03c..a59f7e6972e5ba606eeb8ecdd1954763f7a7b19a 100644 (file)
--- a/meta
+++ b/meta
@@ -1,8 +1,7 @@
 Version: 1
-Previous: 17bc2d44c1fbcb2a1d60359bfaf5ee0d0c90ba84
+Previous: f6640c013c4074157b9effa3df139f13808ccae7
 Head: 0d16f710364fa187531eff8750fe24760a9ad391
 Applied:
-  ibacm-open-only-prov-endpoints: 0d16f710364fa187531eff8750fe24760a9ad391
 Unapplied:
   suse: 7076e2a00570a3cda4e4ce034419399a23ebfb0a
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c

diff --git a/patches/ibacm-open-only-prov-endpoints b/patches/ibacm-open-only-prov-endpoints
deleted file mode 100644 (file)
index 0560e13..0000000
--- a/patches/ibacm-open-only-prov-endpoints
+++ /dev/null
@@ -1,64 +0,0 @@
-Bottom: 989ff3790414f79d1d5f48618310870be6cb70e5
-Top:    64e8af33e50308b09126af20b30b242eaad40ae2
-Author: Kaike Wan <kaike.wan@intel.com>
-Date:   2015-01-07 14:25:34 -0800
-
-ibacm: open only prov endpoints with name/addr configured
-
-This patch modifies the ibacm core so that it will request the provider to
-open those endpoints that have been assigned with at least one name or address.
-This change will avoid unnecessary endpoint open and close for those without
-any name/address configured by the administrator.
-
-Signed-off-by: Kaike Wan <kaike.wan@intel.com>
-Signed-off-by: Sean Hefty <sean.hefty@intel.com>
-
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index 2d0d2e1..815a916 100644
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -1517,6 +1517,17 @@ acm_ep_insert_addr(struct acmc_ep *ep, const char *name, uint8_t *addr,
-                       goto out;
-               }
- 
-+              /* Open the provider endpoint only if at least a name or
-+                 address is found */
-+              if (!ep->prov_ep_context) {
-+                      ret = ep->port->prov->open_endpoint(&ep->endpoint,
-+                              ep->port->prov_port_context, 
-+                              &ep->prov_ep_context);
-+                      if (ret) {
-+                              acm_log(0, "Error: failed to open prov ep\n");
-+                              goto out;
-+                      }
-+              }
-               ep->addr_info[i].addr.type = addr_type;
-               strncpy(ep->addr_info[i].string_buf, name, ACM_MAX_ADDRESS);
-               memcpy(ep->addr_info[i].addr.info.addr, tmp, ACM_MAX_ADDRESS);
-@@ -1735,12 +1746,6 @@ static void acm_ep_up(struct acmc_port *port, uint16_t pkey)
-       if (!ep)
-               return;
- 
--      if (port->prov->open_endpoint(&ep->endpoint, port->prov_port_context, 
--                                    &ep->prov_ep_context)) {
--              acm_log(0, "Error -- failed to open prov endpoint\n");
--              goto err;
--      }
--
-       ret = acm_assign_ep_names(ep);
-       if (ret) {
-               acm_log(0, "ERROR - unable to assign EP name for pkey 0x%x\n", pkey);
-@@ -1751,9 +1756,9 @@ static void acm_ep_up(struct acmc_port *port, uint16_t pkey)
-       return;
- 
- ep_close:
--      port->prov->close_endpoint(ep->prov_ep_context);
-+      if (ep->prov_ep_context) 
-+              port->prov->close_endpoint(ep->prov_ep_context);
- 
--err:
-       free(ep);
- }