pop

diff --git a/meta b/meta
index 6ce5737fc120f1c112a7ec263d4d3d90427c9b81..64c44498c96353d037ee67395398822d325865bb 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,10 @@
 Version: 1
-Previous: 4ec09d98f641d12df696c4bd7e2cdb807f90752f
-Head: 1058fcd62957c0ba92ef1965ae6dc8b2aa8f1ec4
+Previous: 3240c5b692664a7d1222eb9b938553342c82d5e7
+Head: f82f398daa70118b436b050d37686c44f7255c26
 Applied:
   opt_mc_av: 3f78a720520be5f98889b3b88dbb6344fa227466
   one_mc_join: 1058fcd62957c0ba92ef1965ae6dc8b2aa8f1ec4
+  dyn_ah: f82f398daa70118b436b050d37686c44f7255c26
 Unapplied:
-  dyn_ah: cb5ff3ef664771b3c243847abef220e0151063ee
   addr_size: 8de02c47fbf595132105a7050ad6f755f49f9a7a
 Hidden:

diff --git a/patches/dyn_ah b/patches/dyn_ah
index d2d64ce4db99381c9b0b263bb532e2aa5a78cd57..18c8101086071fb422dcfb636503e091f5b7910d 100644 (file)
--- a/patches/dyn_ah
+++ b/patches/dyn_ah
@@ -1,5 +1,5 @@
-Bottom: c93d236ca31c4be364371bb05930f374530864e6
-Top:    e8b5bb1cf92f403d8767fc1d61cb8c538da64fe3
+Bottom: 0e56d97e8e6ce359a7d2f4979f99fcc197cb8302
+Top:    b4ceef9d5c09998f0ae526f1c77ac77af9ee95e1
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2011-04-01 16:03:40 -0700
 
@@ -22,10 +22,10 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/acm.c b/src/acm.c
-index 7c6cd11..53a8e7b 100644
+index fe42498..8719074 100644
 --- a/src/acm.c
 +++ b/src/acm.c
-@@ -450,20 +450,30 @@ acm_alloc_send(struct acm_ep *ep, struct acm_dest *dest, size_t size)
+@@ -449,20 +449,30 @@ acm_alloc_send(struct acm_ep *ep, struct acm_dest *dest, size_t size)
        msg->mr = ibv_reg_mr(ep->port->dev->pd, msg->data, size, 0);
        if (!msg->mr) {
                acm_log(0, "ERROR - failed to register send buffer\n");
@@ -62,7 +62,7 @@ index 7c6cd11..53a8e7b 100644
        msg->wr.wr.ud.remote_qpn = dest->remote_qpn;
        msg->wr.wr.ud.remote_qkey = ACM_QKEY;
  
-@@ -472,7 +482,10 @@ acm_alloc_send(struct acm_ep *ep, struct acm_dest *dest, size_t size)
+@@ -471,7 +481,10 @@ acm_alloc_send(struct acm_ep *ep, struct acm_dest *dest, size_t size)
        msg->sge.addr = (uintptr_t) msg->data;
        acm_log(2, "%p\n", msg);
        return msg;
@@ -74,7 +74,7 @@ index 7c6cd11..53a8e7b 100644
        free(msg);
        return NULL;
  }
-@@ -491,6 +504,8 @@ acm_init_send_req(struct acm_send_msg *msg, void *context,
+@@ -490,6 +503,8 @@ acm_init_send_req(struct acm_send_msg *msg, void *context,
  static void acm_free_send(struct acm_send_msg *msg)
  {
        acm_log(2, "%p\n", msg);
@@ -83,7 +83,7 @@ index 7c6cd11..53a8e7b 100644
        ibv_dereg_mr(msg->mr);
        acm_put_dest(msg->dest);
        free(msg);
-@@ -775,7 +790,6 @@ static uint8_t
+@@ -774,7 +789,6 @@ static uint8_t
  acm_record_acm_route(struct acm_ep *ep, struct acm_dest *dest)
  {
        int i;
@@ -91,7 +91,7 @@ index 7c6cd11..53a8e7b 100644
  
        acm_log(2, "\n");
        for (i = 0; i < MAX_EP_MC; i++) {
-@@ -790,18 +804,8 @@ acm_record_acm_route(struct acm_ep *ep, struct acm_dest *dest)
+@@ -789,18 +803,8 @@ acm_record_acm_route(struct acm_ep *ep, struct acm_dest *dest)
        dest->path = ep->mc_dest[i].path;
        dest->path.dgid = dest->av.grh.dgid;
        dest->path.dlid = htons(dest->av.dlid);
@@ -112,7 +112,7 @@ index 7c6cd11..53a8e7b 100644
  }
  
  static void acm_init_path_query(struct ib_sa_mad *mad)
-@@ -1097,15 +1101,6 @@ acm_dest_sa_resp(struct acm_send_msg *msg, struct ibv_wc *wc, struct acm_mad *ma
+@@ -1096,15 +1100,6 @@ acm_dest_sa_resp(struct acm_send_msg *msg, struct ibv_wc *wc, struct acm_mad *ma
        if (!status) {
                memcpy(&dest->path, sa_mad->data, sizeof(dest->path));
                acm_init_path_av(msg->ep->port, dest);
@@ -128,7 +128,7 @@ index 7c6cd11..53a8e7b 100644
                dest->state = ACM_READY;
        } else {
                dest->state = ACM_INIT;
-@@ -1165,7 +1160,6 @@ acm_process_addr_req(struct acm_ep *ep, struct ibv_wc *wc, struct acm_mad *mad)
+@@ -1164,7 +1159,6 @@ acm_process_addr_req(struct acm_ep *ep, struct ibv_wc *wc, struct acm_mad *mad)
                        break;
  
                acm_log(2, "src service has new qp, resetting\n");