refresh

diff --git a/meta b/meta
index f20766f168970dda1113dce01029a69d30e7d1a3..c485c5697bac9dfa7c8ca13be559c9e59580a159 100644 (file)
--- a/meta
+++ b/meta
@@ -1,11 +1,10 @@
 Version: 1
-Previous: 64af090cf0fef4c788c6fb3e9525bca122cc7d4e
-Head: dffb4af7139919579b0b3a774453a17682f6cbc8
+Previous: 27b3048f33924333a45f5ebdd376ca5d6e6b8ad3
+Head: 0a7cbd421d61024b64bbc233135f0789dda0df6b
 Applied:
   addr_open: 1fd2bfd86e2e2fe78f9d5d6d39aa5502938923f0
   open_dev: 4687a6571146acd8d9a1553a96e2e4f7e8318761
-  ep_active: 7fa840620e39350b258a211442be089be27eb3e5
-  refresh-temp: dffb4af7139919579b0b3a774453a17682f6cbc8
+  ep_active: 0a7cbd421d61024b64bbc233135f0789dda0df6b
 Unapplied:
   autoaddr: 36281f18de15f2482e21ae1304f2e34e9ecf187d
   async_mc: c51c6e84981821b2541daba97cee9a29cd1d3709

diff --git a/patches/ep_active b/patches/ep_active
index 9340a0974092c467f254fa7ba76cf20ae21c9ce6..1e18f7b837495fb18e93ed92c0a994d699e0213a 100644 (file)
--- a/patches/ep_active
+++ b/patches/ep_active
@@ -1,5 +1,5 @@
 Bottom: fb1d0cc95bf413473d6098cbb67824845146864e
-Top:    19610f5ed6d90b58d8fe662ad4c233e4cb5efe8c
+Top:    28bee7f87c687e12ae35f480b9e9d62027ef7e56
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2011-01-20 17:06:28 -0800
 
@@ -24,7 +24,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/acm.c b/src/acm.c
-index f21f702..add7247 100644
+index f21f702..1cc91c8 100644
 --- a/src/acm.c
 +++ b/src/acm.c
 @@ -294,15 +294,22 @@ static int acm_compare_dest(const void *dest1, const void *dest2)
@@ -287,7 +287,7 @@ index f21f702..add7247 100644
 -      port->state = IBV_PORT_NOP;
 +      acm_port_join(port);
 +      lock_acquire(&port->lock);
-+      port->state = attr.state;
++      port->state = IBV_PORT_ACTIVE;
 +      lock_release(&port->lock);
  }
  

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 7482df1..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,21 +0,0 @@
-Bottom: 19610f5ed6d90b58d8fe662ad4c233e4cb5efe8c
-Top:    28bee7f87c687e12ae35f480b9e9d62027ef7e56
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2011-01-26 14:03:42 -0800
-
-Refresh of ep_active
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index add7247..1cc91c8 100644
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -2651,7 +2651,7 @@ static void acm_port_up(struct acm_port *port)
- 
-       acm_port_join(port);
-       lock_acquire(&port->lock);
--      port->state = attr.state;
-+      port->state = IBV_PORT_ACTIVE;
-       lock_release(&port->lock);
- }