refresh

diff --git a/meta b/meta
index f14066fa42fc98c74f2d542f5cf7020890985eba..3212a486b84ffd35532d8cf21f2e63878e26796f 100644 (file)
--- a/meta
+++ b/meta
@@ -1,14 +1,13 @@
 Version: 1
-Previous: 5102be4dadd125c4a27462cee3f4dd4591880adf
-Head: b103e39a4df14ccb59420b743e55250b4e2d310f
+Previous: 49d69af4a289148ecdd3acdfb677005dc48364a4
+Head: ea5bf6fa7076fd218bae83bfec00fe3fad77fd64
 Applied:
   addr_open: 1fd2bfd86e2e2fe78f9d5d6d39aa5502938923f0
   open_dev: 4687a6571146acd8d9a1553a96e2e4f7e8318761
   ep_active: 77fc3b61749ca5785e28bf487a5df84189466ecb
   sm_lid: eb7c2092cc0a44cf84428c536c9dd65da97b8069
   sm_lid_get: dc8017769d3dfcbd85ae7ec037c871ac476a4c2d
-  port_up: 7ea34e7a00a48f8d8a60cd20bc90d0022446aa77
-  refresh-temp: b103e39a4df14ccb59420b743e55250b4e2d310f
+  port_up: ea5bf6fa7076fd218bae83bfec00fe3fad77fd64
 Unapplied:
   port_down: 16935d76ca0edbff93d7ae85efd6e32cef101188
   dbg: b911e84d3489a4d3b1b335e90404808c2530050a

diff --git a/patches/port_up b/patches/port_up
index d852b4eb7c4f2c1c23fd7997f3571f4e46ca53d6..e93589ef38b4ac91743fb127b7be0f2b3315ad45 100644 (file)
--- a/patches/port_up
+++ b/patches/port_up
@@ -1,5 +1,5 @@
 Bottom: 74ae0221f2792e6abb76fa789cd3beb3d720e95b
-Top:    4ec4c78d77d1a28a8bde09ae6c4e23021649ebc5
+Top:    b9a580831ca5776b24c7bb9ca9a3bb334d8884e8
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2011-02-22 10:26:01 -0800
 
@@ -15,7 +15,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/acm.c b/src/acm.c
-index 3590c16..dcd58c0 100644
+index 3590c16..2570fdc 100644
 --- a/src/acm.c
 +++ b/src/acm.c
 @@ -2499,14 +2499,37 @@ static int acm_init_ep_loopback(struct acm_ep *ep)
@@ -153,7 +153,7 @@ index 3590c16..dcd58c0 100644
                ret = ibv_query_pkey(port->dev->verbs, port->port_num, port->pkey_cnt, &pkey);
                if (ret || !pkey)
                        break;
-@@ -2651,25 +2698,11 @@ static void acm_port_up(struct acm_port *port)
+@@ -2651,25 +2698,12 @@ static void acm_port_up(struct acm_port *port)
        if (!port->sa_dest.ah)
                return;
  
@@ -178,10 +178,11 @@ index 3590c16..dcd58c0 100644
 -      lock_acquire(&port->lock);
        port->state = IBV_PORT_ACTIVE;
 -      lock_release(&port->lock);
++      acm_log(1, "%s %d is up\n", port->dev->verbs->device->name, port->port_num);
  }
  
  /*
-@@ -2681,13 +2714,31 @@ static void acm_port_up(struct acm_port *port)
+@@ -2681,13 +2715,31 @@ static void acm_port_up(struct acm_port *port)
  static void CDECL_FUNC acm_event_handler(void *context)
  {
        struct acm_device *dev = (struct acm_device *) context;

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 8f022dc..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,21 +0,0 @@
-Bottom: 4ec4c78d77d1a28a8bde09ae6c4e23021649ebc5
-Top:    b9a580831ca5776b24c7bb9ca9a3bb334d8884e8
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2011-03-04 15:26:51 -0800
-
-Refresh of port_up
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index dcd58c0..2570fdc 100644
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -2703,6 +2703,7 @@ static void acm_port_up(struct acm_port *port)
- 
-       acm_port_join(port);
-       port->state = IBV_PORT_ACTIVE;
-+      acm_log(1, "%s %d is up\n", port->dev->verbs->device->name, port->port_num);
- }
- 
- /*