refresh

diff --git a/meta b/meta
index e1bddab61379e5d9765dea46cc9b0dc377f1a13f..a9b2c972b7f85eff7a080363d4b320e93ce52205 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,9 @@
 Version: 1
-Previous: dc68b6ee877c3bc1062840512d1c525d26599d86
-Head: bf737a8a4bb445f2d88aca3fef1386f98f827d99
+Previous: e9e44f83aff16fb0243788c0e5d89a6dee9116cb
+Head: d7029e0d84f6ebf96e5cbffae94f64d0d9fbc174
 Applied:
   logging: 88d1bcda7ee4d64fe55e1e639cd485422a30c23b
-  acm_snoop: b132c3874f32b66cb122e46bb03bd22f3c8bcd0a
-  refresh-temp: bf737a8a4bb445f2d88aca3fef1386f98f827d99
+  acm_snoop: d7029e0d84f6ebf96e5cbffae94f64d0d9fbc174
 Unapplied:
   loopback: 8c3473645ff2d6097b6a9c351a726ea48c1d8165
 Hidden:

diff --git a/patches/acm_snoop b/patches/acm_snoop
index dbce534cd97406478ccf8e5a4936b3c4e280207d..5c1cb9f7be9ce30a8687a9ff49d3ddf4d7a7fcce 100644 (file)
--- a/patches/acm_snoop
+++ b/patches/acm_snoop
@@ -1,5 +1,5 @@
 Bottom: d1d96503c5833062d50818f5ab44f42d2432089a
-Top:    d1d96503c5833062d50818f5ab44f42d2432089a
+Top:    081445f870110afaf96dc99d0dbd4e2e221fbc22
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-11-15 12:08:46 -0800
 
@@ -26,4 +26,16 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/src/acm.c b/src/acm.c
+index f5eec84..88bbf9a 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 (addr_index >= 0) {
++              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 fa1fdd4..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: d1d96503c5833062d50818f5ab44f42d2432089a
-Top:    081445f870110afaf96dc99d0dbd4e2e221fbc22
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-11-15 12:10:40 -0800
-
-Refresh of acm_snoop
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index f5eec84..88bbf9a 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 (addr_index >= 0) {
-+              if (!DListEmpty(dest->req_queue)) {
-                       status = acm_resolve_path(ep, dest, acm_resolve_sa_resp);
-                       if (status)
-                               break;