refresh

diff --git a/meta b/meta
index e17701d620c2dbb397709970bc152109ea4dd911..536bcead10008125c0f12954c1f849d4a7401fc4 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 23fc905c1e175dc4a5db3fa23dad7c0aa95c159c
-Head: d7b4fcc9684a75a59d530072ebc31ccbe48981e8
+Previous: 9d13efec4ab30ea0c07467539182025d33de3e26
+Head: 1cb86deb4a09aeb863729a45aeebe06f962f6bbe
 Applied:
   addr_open: 1fd2bfd86e2e2fe78f9d5d6d39aa5502938923f0
   open_dev: 4687a6571146acd8d9a1553a96e2e4f7e8318761
@@ -8,8 +8,7 @@ Applied:
   sm_lid: eb7c2092cc0a44cf84428c536c9dd65da97b8069
   sm_lid_get: dc8017769d3dfcbd85ae7ec037c871ac476a4c2d
   port_up: ea5bf6fa7076fd218bae83bfec00fe3fad77fd64
-  port_down: 0d44739947931e564acc1ee58a6fdfd0f21cc534
-  refresh-temp: d7b4fcc9684a75a59d530072ebc31ccbe48981e8
+  port_down: 1cb86deb4a09aeb863729a45aeebe06f962f6bbe
 Unapplied:
   dbg: ca5e464e9678a1d916a56978e8b448b3f36c239d
   addr_size: 8de02c47fbf595132105a7050ad6f755f49f9a7a

diff --git a/patches/port_down b/patches/port_down
index c88969eefb67a5e01b3d11c9862535f990d1269b..4ac591e7e6ee208329c8063655cbf173c13b13c3 100644 (file)
--- a/patches/port_down
+++ b/patches/port_down
@@ -1,5 +1,5 @@
 Bottom: b9a580831ca5776b24c7bb9ca9a3bb334d8884e8
-Top:    f5c974f1dab5d6590249d5fb293581d9cf4856a2
+Top:    4a725c3b21d37e7ff6d4e2430fc69ddf4d72920a
 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 2570fdc..f4a19d9 100644
+index 2570fdc..15f2631 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)
@@ -88,7 +88,15 @@ index 2570fdc..f4a19d9 100644
                mc_rec->mgid.raw, sizeof(mc_rec->mgid));
  
        ret = umad_send(port->mad_portid, port->mad_agentid, (void *) umad,
-@@ -1799,7 +1831,14 @@ acm_svr_query_path(struct acm_client *client, struct acm_resolve_msg *msg)
+@@ -1508,6 +1540,7 @@ static void acm_port_join(struct acm_port *port)
+                ep_entry = ep_entry->Next) {
+ 
+               ep = container_of(ep_entry, struct acm_ep, entry);
++              ep->mc_cnt = 0;
+               acm_join_group(ep, &port_gid, 0, 0, 0, min_rate, min_mtu);
+ 
+               if ((ep->state = ep->mc_dest[0].state) != ACM_READY)
+@@ -1799,7 +1832,14 @@ acm_svr_query_path(struct acm_client *client, struct acm_resolve_msg *msg)
                goto resp;
        }
  
@@ -103,7 +111,7 @@ index 2570fdc..f4a19d9 100644
        if (!sa_msg) {
                acm_log(0, "ERROR - cannot allocate send msg\n");
                status = ACM_STATUS_ENOMEM;
-@@ -2522,6 +2561,7 @@ static struct acm_ep *
+@@ -2522,6 +2562,7 @@ static struct acm_ep *
  acm_alloc_ep(struct acm_port *port, uint16_t pkey, uint16_t pkey_index)
  {
        struct acm_ep *ep;
@@ -111,7 +119,7 @@ index 2570fdc..f4a19d9 100644
  
        acm_log(1, "\n");
        ep = calloc(1, sizeof *ep);
-@@ -2540,6 +2580,10 @@ acm_alloc_ep(struct acm_port *port, uint16_t pkey, uint16_t pkey_index)
+@@ -2540,6 +2581,10 @@ acm_alloc_ep(struct acm_port *port, uint16_t pkey, uint16_t pkey_index)
        DListInit(&ep->active_queue);
        DListInit(&ep->wait_queue);
        lock_init(&ep->lock);
@@ -122,7 +130,7 @@ index 2570fdc..f4a19d9 100644
        return ep;
  }
  
-@@ -2698,6 +2742,7 @@ static void acm_port_up(struct acm_port *port)
+@@ -2698,6 +2743,7 @@ static void acm_port_up(struct acm_port *port)
        if (!port->sa_dest.ah)
                return;
  
@@ -130,7 +138,7 @@ index 2570fdc..f4a19d9 100644
        for (i = 0; i < port->pkey_cnt; i++)
                 acm_ep_up(port, (uint16_t) i);
  
-@@ -2706,6 +2751,32 @@ static void acm_port_up(struct acm_port *port)
+@@ -2706,6 +2752,32 @@ static void acm_port_up(struct acm_port *port)
        acm_log(1, "%s %d is up\n", port->dev->verbs->device->name, port->port_num);
  }
  
@@ -163,7 +171,7 @@ index 2570fdc..f4a19d9 100644
  /*
   * There is one event handler thread per device.  This is the only thread that
   * modifies the port state or a port endpoint list.  Other threads which access
-@@ -2728,12 +2799,18 @@ static void CDECL_FUNC acm_event_handler(void *context)
+@@ -2728,12 +2800,18 @@ static void CDECL_FUNC acm_event_handler(void *context)
                if (ret)
                        continue;
  

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index f97a204..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,21 +0,0 @@
-Bottom: f5c974f1dab5d6590249d5fb293581d9cf4856a2
-Top:    4a725c3b21d37e7ff6d4e2430fc69ddf4d72920a
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2011-03-04 15:57:46 -0800
-
-Refresh of port_down
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index f4a19d9..15f2631 100644
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -1540,6 +1540,7 @@ static void acm_port_join(struct acm_port *port)
-                ep_entry = ep_entry->Next) {
- 
-               ep = container_of(ep_entry, struct acm_ep, entry);
-+              ep->mc_cnt = 0;
-               acm_join_group(ep, &port_gid, 0, 0, 0, min_rate, min_mtu);
- 
-               if ((ep->state = ep->mc_dest[0].state) != ACM_READY)