refresh

diff --git a/meta b/meta
index 6d89c684ac4f5b35273c7b6a297967221854b23c..98175c7d99d2ee1c6d995a21b24ecad5db89db4c 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: bcaed2a5914b69ef174c8ed8f7e0adfc102c626c
-Head: ee0d97e738ae3a988a01b5d0a03a743b9987c19d
+Previous: c803c9ed7437920bbb84cc6346f3cc8ea49496e4
+Head: 4241a1ee0838579443846233ba67f9f6464db855
 Applied:
-  acm_snoop: 6d9b27b37026f9090ad55a36f26814f90f3772dd
-  refresh-temp: ee0d97e738ae3a988a01b5d0a03a743b9987c19d
+  acm_snoop: 4241a1ee0838579443846233ba67f9f6464db855
 Unapplied:
   log_lid: 6ac592a74d5289b4800c84ef8c20e8ff3f2f263e
   logging: 4ca254f3d8fda6ae709f0c38461f75b9677fa5df

diff --git a/patches/acm_snoop b/patches/acm_snoop
index 48d3054010fb19714f5d9a0ed3d6d22f1b3e0ffc..02693fafb11d5cdd190574dc5538551b1491ea2b 100644 (file)
--- a/patches/acm_snoop
+++ b/patches/acm_snoop
@@ -1,5 +1,5 @@
 Bottom: 30326a5093b7b177c8d7612eba401d4999793f71
-Top:    6cb4f6d1969e3d74eccfef634bcc43eed7b2a746
+Top:    948e405887f06ec7efba8d92fe151c75557ed455
 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 820365c..0db57eb 100644
+index 820365c..932297d 100644
 --- a/src/acm.c
 +++ b/src/acm.c
 @@ -1010,7 +1010,7 @@ acm_process_addr_req(struct acm_ep *ep, struct ibv_wc *wc, struct acm_mad *mad)
@@ -35,7 +35,7 @@ index 820365c..0db57eb 100644
                        break;
                }
 -              if (addr_index >= 0) {
-+              if (!DListEmpty(&dest->req_queue)) {
++              if (addr_index >= 0 || !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 15af6e9..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: 6cb4f6d1969e3d74eccfef634bcc43eed7b2a746
-Top:    948e405887f06ec7efba8d92fe151c75557ed455
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-11-15 19:28:49 -0800
-
-Refresh of acm_snoop
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index 0db57eb..932297d 100644
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -1010,7 +1010,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 (addr_index >= 0 || !DListEmpty(&dest->req_queue)) {
-                       status = acm_resolve_path(ep, dest, acm_resolve_sa_resp);
-                       if (status)
-                               break;