]> git.openfabrics.org - ~shefty/ibacm.git/commitdiff
refresh
authorSean Hefty <sean.hefty@intel.com>
Sat, 13 Nov 2010 00:57:18 +0000 (16:57 -0800)
committerSean Hefty <sean.hefty@intel.com>
Sat, 13 Nov 2010 00:57:18 +0000 (16:57 -0800)
meta
patches/logging
patches/refresh-temp [deleted file]

diff --git a/meta b/meta
index ce1d05ba254621a16ae150495b00b3f38e8a3e3d..abf4f6dae10a12da36237b128744ff84b61de562 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: c8b6b40b70ee4f4eb6dfe6a9d00a21eb23e39d5e
-Head: 6943c4c3567ef08aba6d49ebdc397e4d94e5a9fd
+Previous: 8d343f5e16fd4713e8f241e164d55b5942baffa2
+Head: c454aa58ee351721377edbd6dee8c6430d272b10
 Applied:
-  logging: ba6f753e48f052f07641ff10022507073512b0b7
-  refresh-temp: 6943c4c3567ef08aba6d49ebdc397e4d94e5a9fd
+  logging: c454aa58ee351721377edbd6dee8c6430d272b10
 Unapplied:
   loopback: 8c3473645ff2d6097b6a9c351a726ea48c1d8165
 Hidden:
index a9473b313511ad682607b0a17659f105a3a629f3..f0216b606a4687f6c441b2441359ffbaad59d9ca 100644 (file)
@@ -1,5 +1,5 @@
 Bottom: 30326a5093b7b177c8d7612eba401d4999793f71
-Top:    93c6aab81f8d2dd6af9e1e1a410d245b3cc3db90
+Top:    f7a1f1c1023875113795904442cbfed9effc2fbd
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-11-11 16:51:45 -0800
 
@@ -17,7 +17,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/acm.c b/src/acm.c
-index 820365c..17eeb6e 100644
+index 820365c..d33fc12 100644
 --- a/src/acm.c
 +++ b/src/acm.c
 @@ -37,6 +37,7 @@
@@ -139,7 +139,7 @@ index 820365c..17eeb6e 100644
        struct acm_mad *mad;
  
 -      acm_log(2, "\n");
-+      acm_log_addr(2, "acm_process_recv: ep ", ep->addr_type, ep->addr);
++      acm_log_addr(2, "acm_process_recv: ep ", ep->addr_type[0].addr, ep->addr[0]);
        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 (file)
index 389f950..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: 93c6aab81f8d2dd6af9e1e1a410d245b3cc3db90
-Top:    f7a1f1c1023875113795904442cbfed9effc2fbd
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-11-12 16:57:18 -0800
-
-Refresh of logging
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index 17eeb6e..d33fc12 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, ep->addr);
-+      acm_log_addr(2, "acm_process_recv: ep ", ep->addr_type[0].addr, ep->addr[0]);
-       mad = (struct acm_mad *) (uintptr_t) (wc->wr_id + sizeof(struct ibv_grh));
-       switch (mad->mgmt_class) {
-       case IB_MGMT_CLASS_SA: