refresh

diff --git a/meta b/meta
index 567cb337d13477cee38e48e26eb09c3791064f2a..f2bc2aff49342cbb6a897f341970c6ad172e2650 100644 (file)
--- a/meta
+++ b/meta
@@ -1,14 +1,13 @@
 Version: 1
-Previous: 6e2909efbedacbddadbe5770589ca73199111bb9
-Head: a10d8146e7dba144d457df36196515741aade622
+Previous: 28be6ae6d7d3060cf268bb973993e38765d66720
+Head: e0428c7bc9e76f22a771e1c770fd9f05c10792fc
 Applied:
   addr_open: 1fd2bfd86e2e2fe78f9d5d6d39aa5502938923f0
   open_dev: 4687a6571146acd8d9a1553a96e2e4f7e8318761
   ep_active: 77fc3b61749ca5785e28bf487a5df84189466ecb
   sm_lid: eb7c2092cc0a44cf84428c536c9dd65da97b8069
   sm_lid_get: dc8017769d3dfcbd85ae7ec037c871ac476a4c2d
-  port_up: edf154204a2bec389c5346b95efb69d966f123dd
-  refresh-temp: a10d8146e7dba144d457df36196515741aade622
+  port_up: e0428c7bc9e76f22a771e1c770fd9f05c10792fc
 Unapplied:
   port_down: 8208380a044b1c2c1fc5c7a9732169b8a5e42430
   autoaddr: 36281f18de15f2482e21ae1304f2e34e9ecf187d

diff --git a/patches/port_up b/patches/port_up
index cef6ba88433f35efea5d8bd4871f7e80a21661fe..f6ef57797f62655b7b1b4982421c4cf3cc0f94f3 100644 (file)
--- a/patches/port_up
+++ b/patches/port_up
@@ -1,5 +1,5 @@
 Bottom: 74ae0221f2792e6abb76fa789cd3beb3d720e95b
-Top:    28bffa69a25094b9fce611952901c92c0f397e10
+Top:    97be99963c4e96b8d2169a2de8d6113a0f70dc91
 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..624c3d3 100644
+index 3590c16..551c291 100644
 --- a/src/acm.c
 +++ b/src/acm.c
 @@ -2499,14 +2499,35 @@ static int acm_init_ep_loopback(struct acm_ep *ep)
@@ -125,17 +125,7 @@ index 3590c16..624c3d3 100644
  }
  
  static void acm_port_up(struct acm_port *port)
-@@ -2611,6 +2654,9 @@ static void acm_port_up(struct acm_port *port)
-       int i, ret;
- 
-       acm_log(1, "%s %d\n", port->dev->verbs->device->name, port->port_num);
-+      if (port->state == IBV_PORT_ACTIVE)
-+              return;
-+
-       ret = ibv_query_port(port->dev->verbs, port->port_num, &attr);
-       if (ret) {
-               acm_log(0, "ERROR - unable to get port state\n");
-@@ -2624,13 +2670,13 @@ static void acm_port_up(struct acm_port *port)
+@@ -2624,13 +2667,13 @@ static void acm_port_up(struct acm_port *port)
        port->mtu = attr.active_mtu;
        port->rate = acm_get_rate(attr.active_width, attr.active_speed);
        port->subnet_timeout = 1 << (attr.subnet_timeout - 8);
@@ -151,7 +141,7 @@ index 3590c16..624c3d3 100644
                ret = ibv_query_pkey(port->dev->verbs, port->port_num, port->pkey_cnt, &pkey);
                if (ret || !pkey)
                        break;
-@@ -2651,20 +2697,8 @@ static void acm_port_up(struct acm_port *port)
+@@ -2651,20 +2694,8 @@ static void acm_port_up(struct acm_port *port)
        if (!port->sa_dest.ah)
                return;
  
@@ -174,7 +164,7 @@ index 3590c16..624c3d3 100644
  
        acm_port_join(port);
        lock_acquire(&port->lock);
-@@ -2681,13 +2715,31 @@ static void acm_port_up(struct acm_port *port)
+@@ -2681,13 +2712,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 df883ee..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,23 +0,0 @@
-Bottom: 28bffa69a25094b9fce611952901c92c0f397e10
-Top:    97be99963c4e96b8d2169a2de8d6113a0f70dc91
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2011-02-23 16:51:43 -0800
-
-Refresh of port_up
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index 624c3d3..551c291 100644
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -2654,9 +2654,6 @@ static void acm_port_up(struct acm_port *port)
-       int i, ret;
- 
-       acm_log(1, "%s %d\n", port->dev->verbs->device->name, port->port_num);
--      if (port->state == IBV_PORT_ACTIVE)
--              return;
--
-       ret = ibv_query_port(port->dev->verbs, port->port_num, &attr);
-       if (ret) {
-               acm_log(0, "ERROR - unable to get port state\n");