refresh

diff --git a/meta b/meta
index 5b1bacfe1869e3150a75a010cd54fefdb28859f7..5d4d25edf6cf7bc2341a3a9e59c9ec5b47b77c16 100644 (file)
--- a/meta
+++ b/meta
@@ -1,11 +1,10 @@
 Version: 1
-Previous: 55fb8cbbea886cb936ac4d35ba3a8c9dd31006c5
-Head: 9a53f47067f2461bef8fbdd35080edfc7b74069e
+Previous: 99ed4e893448aba3a3d64083d0eba968c830ae73
+Head: 7e0a5a5572763ba3fe86d256063458462217a201
 Applied:
   logging: 88d1bcda7ee4d64fe55e1e639cd485422a30c23b
   acm_snoop: bfcb41cccea5442ff7996133c7dd8e11362b041e
-  logging2: e8b013ff951a8c08d515ca0528303d7f5acdf35f
-  refresh-temp: 9a53f47067f2461bef8fbdd35080edfc7b74069e
+  logging2: 7e0a5a5572763ba3fe86d256063458462217a201
 Unapplied:
   loopback: 8c3473645ff2d6097b6a9c351a726ea48c1d8165
 Hidden:

diff --git a/patches/logging2 b/patches/logging2
index b2a2c829998f8af4bce955ad889d8c9bc06bd2dd..0516b1a97e2a3e16fe93a797d8276d496d4d1a97 100644 (file)
--- a/patches/logging2
+++ b/patches/logging2
@@ -1,5 +1,5 @@
 Bottom: 0f063c91893feaff89b12fc524a41fee5462240a
-Top:    0f063c91893feaff89b12fc524a41fee5462240a
+Top:    98a5749e2dc00110fe15d356965cd76d268ec358
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-11-15 12:37:47 -0800
 
@@ -10,4 +10,19 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/src/acm.c b/src/acm.c
+index 41eb64e..4278489 100644
+--- a/src/acm.c
++++ b/src/acm.c
+@@ -931,9 +931,11 @@ acm_dest_sa_resp(struct acm_send_msg *msg, struct ibv_wc *wc, struct acm_mad *ma
+               status = ACM_STATUS_ETIMEDOUT;
+       }
+       acm_log(2, "resp status 0x%x\n", status);
++      acm_log_addr(2, "acm_dest_sa_resp: ", dest->addr_type, dest->address);
+ 
+       lock_acquire(&dest->lock);
+       if (dest->state != ACM_QUERY_ROUTE) {
++              acm_log(2, "discarding SA response\n");
+               lock_release(&dest->lock);
+               return;
+       }

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index ebcff6f..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,25 +0,0 @@
-Bottom: 0f063c91893feaff89b12fc524a41fee5462240a
-Top:    98a5749e2dc00110fe15d356965cd76d268ec358
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-11-15 12:37:57 -0800
-
-Refresh of logging2
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index 41eb64e..4278489 100644
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -931,9 +931,11 @@ acm_dest_sa_resp(struct acm_send_msg *msg, struct ibv_wc *wc, struct acm_mad *ma
-               status = ACM_STATUS_ETIMEDOUT;
-       }
-       acm_log(2, "resp status 0x%x\n", status);
-+      acm_log_addr(2, "acm_dest_sa_resp: ", dest->addr_type, dest->address);
- 
-       lock_acquire(&dest->lock);
-       if (dest->state != ACM_QUERY_ROUTE) {
-+              acm_log(2, "discarding SA response\n");
-               lock_release(&dest->lock);
-               return;
-       }