refresh

diff --git a/meta b/meta
index 77e524ad28dd779fa4875160173db7374aaac01b..d6adfadeb98a6493fc2f6d1182988fc88090e529 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,9 @@
 Version: 1
-Previous: b5815e4f229dc2a590ba97e6f7fc3b59116cb42f
-Head: 557406028848c9549f7ca53d751e90238a04e626
+Previous: e13bcab723c0334d0754ea0f469b2d1acd0e678b
+Head: bfcb41cccea5442ff7996133c7dd8e11362b041e
 Applied:
   logging: 88d1bcda7ee4d64fe55e1e639cd485422a30c23b
-  acm_snoop: d7029e0d84f6ebf96e5cbffae94f64d0d9fbc174
-  refresh-temp: 557406028848c9549f7ca53d751e90238a04e626
+  acm_snoop: bfcb41cccea5442ff7996133c7dd8e11362b041e
 Unapplied:
   loopback: 8c3473645ff2d6097b6a9c351a726ea48c1d8165
 Hidden:

diff --git a/patches/acm_snoop b/patches/acm_snoop
index 5c1cb9f7be9ce30a8687a9ff49d3ddf4d7a7fcce..80c6c48e60328aedad3d14593992e0a423d36cc1 100644 (file)
--- a/patches/acm_snoop
+++ b/patches/acm_snoop
@@ -1,5 +1,5 @@
 Bottom: d1d96503c5833062d50818f5ab44f42d2432089a
-Top:    081445f870110afaf96dc99d0dbd4e2e221fbc22
+Top:    0f063c91893feaff89b12fc524a41fee5462240a
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-11-15 12:08:46 -0800
 
@@ -27,7 +27,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/acm.c b/src/acm.c
-index f5eec84..88bbf9a 100644
+index f5eec84..41eb64e 100644
 --- a/src/acm.c
 +++ b/src/acm.c
 @@ -1020,7 +1020,7 @@ acm_process_addr_req(struct acm_ep *ep, struct ibv_wc *wc, struct acm_mad *mad)
@@ -35,7 +35,7 @@ index f5eec84..88bbf9a 100644
                        break;
                }
 -              if (addr_index >= 0) {
-+              if (!DListEmpty(dest->req_queue)) {
++              if (!DListEmpty(&dest->req_queue)) {
                        status = acm_resolve_path(ep, dest, acm_resolve_sa_resp);
                        if (status)
                                break;

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index f97ae2c..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: 081445f870110afaf96dc99d0dbd4e2e221fbc22
-Top:    0f063c91893feaff89b12fc524a41fee5462240a
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-11-15 12:11:20 -0800
-
-Refresh of acm_snoop
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index 88bbf9a..41eb64e 100644
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -1020,7 +1020,7 @@ acm_process_addr_req(struct acm_ep *ep, struct ibv_wc *wc, struct acm_mad *mad)
-                       status = acm_record_acm_route(ep, dest);
-                       break;
-               }
--              if (!DListEmpty(dest->req_queue)) {
-+              if (!DListEmpty(&dest->req_queue)) {
-                       status = acm_resolve_path(ep, dest, acm_resolve_sa_resp);
-                       if (status)
-                               break;