refresh

diff --git a/meta b/meta
index 4d07deb6ff2cde9587e953134a01bc9e99bd2c41..c86ea352203abadd34ea53c02de52a90cccfe8cb 100644 (file)
--- a/meta
+++ b/meta
@@ -1,12 +1,11 @@
 Version: 1
-Previous: 3c010c7ece463fe7560e78384e4b9b7b7d885645
-Head: d4071cb47d80581dbea4f10c88400836f14ed599
+Previous: eb6d646f7f15230b1ff9854ef750b316866b4638
+Head: c49efed0690847609c8ae85b1e6951ed0381e088
 Applied:
   acm_snoop: 4241a1ee0838579443846233ba67f9f6464db855
   log_lid: 9bc99c564c67392596986084c29697a4fb55d006
   logging: 39170d53e725bd8dc493d1eea532c63fde504e61
   dest_string: d234c9d83479e496fa925c7f46b806d07a35d3d4
-  loop: dc8176eaa76131fc9f6dfe2f19558ef23dd3028c
-  refresh-temp: d4071cb47d80581dbea4f10c88400836f14ed599
+  loop: c49efed0690847609c8ae85b1e6951ed0381e088
 Unapplied:
 Hidden:

diff --git a/patches/loop b/patches/loop
index 5809b41796e7d2f9da43af9b68782695435cc464..935a4b9d6fe3be888921a198e5fdef690b8b8577 100644 (file)
--- a/patches/loop
+++ b/patches/loop
@@ -1,5 +1,5 @@
 Bottom: 586b39cacd2b705239045da946e474cb11840ae8
-Top:    f753fc77ff0487c91ad6761d39d3786136eb1015
+Top:    d272f38dc5913b7f57e6169aebf6ad4b877102eb
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-11-16 10:39:24 -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 77194ff..754a74b 100644
+index 77194ff..0f9f8f9 100644
 --- a/src/acm.c
 +++ b/src/acm.c
 @@ -204,6 +204,7 @@ static char log_file[128] = "stdout";
@@ -35,20 +35,21 @@ index 77194ff..754a74b 100644
  static short server_port = 6125;
  static int timeout = 2000;
  static int retries = 15;
-@@ -2294,6 +2295,37 @@ static int acm_assign_ep_names(struct acm_ep *ep)
+@@ -2294,6 +2295,40 @@ static int acm_assign_ep_names(struct acm_ep *ep)
        return !index;
  }
  
 +static int acm_init_ep_loopback(struct acm_ep *ep)
 +{
 +      struct acm_dest *dest;
-+      int i, ret;
++      int i;
 +
-+      for (i = 0; i < MAX_EP_ADDRESS && ep->addr_type[i]; i++) {
-+              dest = acm_acquire_dest(ep, ep->addr_type[i], &ep->addr[i].addr);
++      acm_log(2, "\n");
++      for (i = 0; i < MAX_EP_ADDR && ep->addr_type[i]; i++) {
++              dest = acm_acquire_dest(ep, ep->addr_type[i], ep->addr[i].addr);
 +              if (!dest) {
 +                      acm_format_name(0, log_data, sizeof log_data,
-+                                      ep->addr_type[i], &ep->addr[i].addr,
++                                      ep->addr_type[i], ep->addr[i].addr,
 +                                      sizeof ep->addr[i].addr);
 +                      acm_log(0, "ERROR - unable to create loopback dest %s\n", log_data);
 +                      return -1;
@@ -64,29 +65,30 @@ index 77194ff..754a74b 100644
 +              dest->path.mtu = (uint8_t) ep->port->mtu;
 +              dest->path.rate = (uint8_t) ep->port->rate;
 +
++              dest->remote_qpn = ep->qp->qp_num;
 +              dest->state = ACM_READY;
 +              acm_put_dest(dest);
++              acm_log(1, "added loopback dest %s\n", dest->name);
 +      }
-+      retutn 0;
++      return 0;
 +}
 +
  static int acm_activate_ep(struct acm_port *port, struct acm_ep *ep, uint16_t pkey_index)
  {
        struct ibv_qp_init_attr init_attr;
-@@ -2323,6 +2355,12 @@ static int acm_activate_ep(struct acm_port *port, struct acm_ep *ep, uint16_t pk
-               return ret;
-       }
+@@ -2383,6 +2418,11 @@ static int acm_activate_ep(struct acm_port *port, struct acm_ep *ep, uint16_t pk
+       if (ret)
+               goto err2;
  
 +      ret = acm_init_ep_loopback(ep);
 +      if (ret) {
 +              acm_log(0, "ERROR - unable to init loopback\n");
-+              return ret;
++              goto err2;
 +      }
-+
-       sq_size = resolve_depth + sa_depth + send_depth;
-       ep->cq = ibv_create_cq(port->dev->verbs, sq_size + recv_depth,
-               ep, port->dev->channel, 0);
-@@ -2620,6 +2658,12 @@ static void acm_set_options(void)
+       return 0;
+ 
+ err2:
+@@ -2620,6 +2660,12 @@ static void acm_set_options(void)
        }
  
        fclose(f);

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index c80a2c0..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,71 +0,0 @@
-Bottom: f753fc77ff0487c91ad6761d39d3786136eb1015
-Top:    d272f38dc5913b7f57e6169aebf6ad4b877102eb
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-11-16 15:40:59 -0800
-
-Refresh of loop
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index 754a74b..0f9f8f9 100644
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -2298,13 +2298,14 @@ static int acm_assign_ep_names(struct acm_ep *ep)
- static int acm_init_ep_loopback(struct acm_ep *ep)
- {
-       struct acm_dest *dest;
--      int i, ret;
-+      int i;
- 
--      for (i = 0; i < MAX_EP_ADDRESS && ep->addr_type[i]; i++) {
--              dest = acm_acquire_dest(ep, ep->addr_type[i], &ep->addr[i].addr);
-+      acm_log(2, "\n");
-+      for (i = 0; i < MAX_EP_ADDR && ep->addr_type[i]; i++) {
-+              dest = acm_acquire_dest(ep, ep->addr_type[i], ep->addr[i].addr);
-               if (!dest) {
-                       acm_format_name(0, log_data, sizeof log_data,
--                                      ep->addr_type[i], &ep->addr[i].addr,
-+                                      ep->addr_type[i], ep->addr[i].addr,
-                                       sizeof ep->addr[i].addr);
-                       acm_log(0, "ERROR - unable to create loopback dest %s\n", log_data);
-                       return -1;
-@@ -2320,10 +2321,12 @@ static int acm_init_ep_loopback(struct acm_ep *ep)
-               dest->path.mtu = (uint8_t) ep->port->mtu;
-               dest->path.rate = (uint8_t) ep->port->rate;
- 
-+              dest->remote_qpn = ep->qp->qp_num;
-               dest->state = ACM_READY;
-               acm_put_dest(dest);
-+              acm_log(1, "added loopback dest %s\n", dest->name);
-       }
--      retutn 0;
-+      return 0;
- }
- 
- static int acm_activate_ep(struct acm_port *port, struct acm_ep *ep, uint16_t pkey_index)
-@@ -2355,12 +2358,6 @@ static int acm_activate_ep(struct acm_port *port, struct acm_ep *ep, uint16_t pk
-               return ret;
-       }
- 
--      ret = acm_init_ep_loopback(ep);
--      if (ret) {
--              acm_log(0, "ERROR - unable to init loopback\n");
--              return ret;
--      }
--
-       sq_size = resolve_depth + sa_depth + send_depth;
-       ep->cq = ibv_create_cq(port->dev->verbs, sq_size + recv_depth,
-               ep, port->dev->channel, 0);
-@@ -2421,6 +2418,11 @@ static int acm_activate_ep(struct acm_port *port, struct acm_ep *ep, uint16_t pk
-       if (ret)
-               goto err2;
- 
-+      ret = acm_init_ep_loopback(ep);
-+      if (ret) {
-+              acm_log(0, "ERROR - unable to init loopback\n");
-+              goto err2;
-+      }
-       return 0;
- 
- err2: