refresh

diff --git a/meta b/meta
index 3427ea6ac1127ddc95bc734a51f33198a4e3f818..e0c0f219497f789210ad12e099c578166b57ab25 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 0846d060122f4b2d0fa90c1179b72a34561f65e7
-Head: 83bc5992ca7d6138352b9cff70328139dbc51e56
+Previous: 5c5478cb300fec55c2de443ea585a6fa7efd0f82
+Head: aa2627fdbc099de216a0c5ebead4a48e895d93e3
 Applied:
   addr_open: 1fd2bfd86e2e2fe78f9d5d6d39aa5502938923f0
   open_dev: 4687a6571146acd8d9a1553a96e2e4f7e8318761
@@ -8,8 +8,7 @@ Applied:
   sm_lid: eb7c2092cc0a44cf84428c536c9dd65da97b8069
   sm_lid_get: dc8017769d3dfcbd85ae7ec037c871ac476a4c2d
   port_up: 7927dc62a19804b42a061a7fd6e6a1752af1376c
-  port_down: a55b46909642162c6ab31f6aee1e6207de04335f
-  refresh-temp: 83bc5992ca7d6138352b9cff70328139dbc51e56
+  port_down: aa2627fdbc099de216a0c5ebead4a48e895d93e3
 Unapplied:
   autoaddr: 36281f18de15f2482e21ae1304f2e34e9ecf187d
   async_mc: c51c6e84981821b2541daba97cee9a29cd1d3709

diff --git a/patches/port_down b/patches/port_down
index 876037fc320b905aadd1e0d8c1ede2ec43951b07..68142cfc1c7f81bbdc243745bdd0675d8bb24256 100644 (file)
--- a/patches/port_down
+++ b/patches/port_down
@@ -1,5 +1,5 @@
 Bottom: b2ee0aae3b7f67bb7f9cf6d8579cdea8dea2b2e2
-Top:    e5d9042ab97d29b8da12a595d79c9a7513d31266
+Top:    e015ee64c309f76545d8b9bf3827bbfdabc6dbe8
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2011-02-23 14:41:48 -0800
 
@@ -14,7 +14,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/acm.c b/src/acm.c
-index c723fe3..d52ff04 100644
+index c723fe3..b15fe35 100644
 --- a/src/acm.c
 +++ b/src/acm.c
 @@ -378,6 +378,27 @@ acm_acquire_dest(struct acm_ep *ep, uint8_t addr_type, uint8_t *addr)
@@ -29,7 +29,7 @@ index c723fe3..d52ff04 100644
 +      lock_acquire(&port->lock);
 +      if (port->state == IBV_PORT_ACTIVE) {
 +              dest = &port->sa_dest;
-+              atomic_inc(&port->sa_dest.refcount);
++              atomic_inc(&port->sa_dest.refcnt);
 +      } else {
 +              dest = NULL;
 +      }
@@ -39,7 +39,7 @@ index c723fe3..d52ff04 100644
 +
 +static void acm_release_sa_dest(struct acm_dest *dest)
 +{
-+      atomic_dec(&dest->refcount);
++      atomic_dec(&dest->refnt);
 +}
 +
  /* Caller must hold ep lock. */
@@ -52,7 +52,7 @@ index c723fe3..d52ff04 100644
 +      uint8_t ret;
  
        acm_log(2, "%s\n", dest->name);
-+      if (!acm_acquire_sa_dest(&ep->port)) {
++      if (!acm_acquire_sa_dest(ep->port)) {
 +              acm_log(1, "cannot acquire SA destination\n");
 +              ret = ACM_STATUS_EINVAL;
 +              goto err;

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index f19d87d..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,40 +0,0 @@
-Bottom: e5d9042ab97d29b8da12a595d79c9a7513d31266
-Top:    e015ee64c309f76545d8b9bf3827bbfdabc6dbe8
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2011-03-04 10:39:57 -0800
-
-Refresh of port_down
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index d52ff04..b15fe35 100644
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -386,7 +386,7 @@ acm_acquire_sa_dest(struct acm_port *port)
-       lock_acquire(&port->lock);
-       if (port->state == IBV_PORT_ACTIVE) {
-               dest = &port->sa_dest;
--              atomic_inc(&port->sa_dest.refcount);
-+              atomic_inc(&port->sa_dest.refcnt);
-       } else {
-               dest = NULL;
-       }
-@@ -396,7 +396,7 @@ acm_acquire_sa_dest(struct acm_port *port)
- 
- static void acm_release_sa_dest(struct acm_dest *dest)
- {
--      atomic_dec(&dest->refcount);
-+      atomic_dec(&dest->refnt);
- }
- 
- /* Caller must hold ep lock. */
-@@ -867,7 +867,7 @@ static uint8_t acm_resolve_path(struct acm_ep *ep, struct acm_dest *dest,
-       uint8_t ret;
- 
-       acm_log(2, "%s\n", dest->name);
--      if (!acm_acquire_sa_dest(&ep->port)) {
-+      if (!acm_acquire_sa_dest(ep->port)) {
-               acm_log(1, "cannot acquire SA destination\n");
-               ret = ACM_STATUS_EINVAL;
-               goto err;