From 01c7c8e6572e276345365d0640adf13f1556c720 Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Fri, 12 Nov 2010 16:58:47 -0800 Subject: [PATCH] refresh --- meta | 7 +++---- patches/logging | 6 +++--- patches/refresh-temp | 22 ---------------------- 3 files changed, 6 insertions(+), 29 deletions(-) delete mode 100644 patches/refresh-temp diff --git a/meta b/meta index 628e6c2..d628e3a 100644 --- a/meta +++ b/meta @@ -1,9 +1,8 @@ Version: 1 -Previous: ed946fbf885dcf83ba4b37536d52268145bf7934 -Head: 41f51f2f5c8d55c7451ffc2dae463ac80a8064f5 +Previous: 970ce84d33e98869e8c450b942b377d819e8915a +Head: 22288465e0296c750fd97bd38012de7c769f0429 Applied: - logging: c454aa58ee351721377edbd6dee8c6430d272b10 - refresh-temp: 41f51f2f5c8d55c7451ffc2dae463ac80a8064f5 + logging: 22288465e0296c750fd97bd38012de7c769f0429 Unapplied: loopback: 8c3473645ff2d6097b6a9c351a726ea48c1d8165 Hidden: diff --git a/patches/logging b/patches/logging index f0216b6..16c2211 100644 --- a/patches/logging +++ b/patches/logging @@ -1,5 +1,5 @@ Bottom: 30326a5093b7b177c8d7612eba401d4999793f71 -Top: f7a1f1c1023875113795904442cbfed9effc2fbd +Top: 097fb1566cae6cb7c620f574b8ad8fe5ea5a77db Author: Sean Hefty Date: 2010-11-11 16:51:45 -0800 @@ -17,7 +17,7 @@ Signed-off-by: Sean Hefty --- diff --git a/src/acm.c b/src/acm.c -index 820365c..d33fc12 100644 +index 820365c..ce3267f 100644 --- a/src/acm.c +++ b/src/acm.c @@ -37,6 +37,7 @@ @@ -139,7 +139,7 @@ index 820365c..d33fc12 100644 struct acm_mad *mad; - acm_log(2, "\n"); -+ acm_log_addr(2, "acm_process_recv: ep ", ep->addr_type[0].addr, ep->addr[0]); ++ acm_log_addr(2, "acm_process_recv: ep ", ep->addr_type[0], ep->addr[0].addr); mad = (struct acm_mad *) (uintptr_t) (wc->wr_id + sizeof(struct ibv_grh)); switch (mad->mgmt_class) { case IB_MGMT_CLASS_SA: diff --git a/patches/refresh-temp b/patches/refresh-temp deleted file mode 100644 index 0932a0d..0000000 --- a/patches/refresh-temp +++ /dev/null @@ -1,22 +0,0 @@ -Bottom: f7a1f1c1023875113795904442cbfed9effc2fbd -Top: 097fb1566cae6cb7c620f574b8ad8fe5ea5a77db -Author: Sean Hefty -Date: 2010-11-12 16:58:47 -0800 - -Refresh of logging - ---- - -diff --git a/src/acm.c b/src/acm.c -index d33fc12..ce3267f 100644 ---- a/src/acm.c -+++ b/src/acm.c -@@ -1195,7 +1195,7 @@ static void acm_process_recv(struct acm_ep *ep, struct ibv_wc *wc) - { - struct acm_mad *mad; - -- acm_log_addr(2, "acm_process_recv: ep ", ep->addr_type[0].addr, ep->addr[0]); -+ acm_log_addr(2, "acm_process_recv: ep ", ep->addr_type[0], ep->addr[0].addr); - mad = (struct acm_mad *) (uintptr_t) (wc->wr_id + sizeof(struct ibv_grh)); - switch (mad->mgmt_class) { - case IB_MGMT_CLASS_SA: -- 2.41.0