refresh

diff --git a/meta b/meta
index a72b2c299bbf4d658c7ef13700901b973b78a852..df3931dbb13826328518a38945e0ece2a7d2cdad 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 487a6d7b4bce2b66856eab791196cad6be769b6b
-Head: 4b50041d9691fd7308994e2d326d746481056519
+Previous: 56203f06abc5fc0612e957e31cb99eb2db6c9d45
+Head: ba6f753e48f052f07641ff10022507073512b0b7
 Applied:
-  logging: cd954cf747410a9beb309cfc79b093fa3117e14f
-  refresh-temp: 4b50041d9691fd7308994e2d326d746481056519
+  logging: ba6f753e48f052f07641ff10022507073512b0b7
 Unapplied:
   loopback: 8c3473645ff2d6097b6a9c351a726ea48c1d8165
 Hidden:

diff --git a/patches/logging b/patches/logging
index 63341e88eceee6e83770f31f9aebc31da315c1bf..a9473b313511ad682607b0a17659f105a3a629f3 100644 (file)
--- a/patches/logging
+++ b/patches/logging
@@ -1,5 +1,5 @@
 Bottom: 30326a5093b7b177c8d7612eba401d4999793f71
-Top:    1df1d44b89d4161f2d3d3274603c0435ddfdd479
+Top:    93c6aab81f8d2dd6af9e1e1a410d245b3cc3db90
 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..fd61a9d 100644
+index 820365c..17eeb6e 100644
 --- a/src/acm.c
 +++ b/src/acm.c
 @@ -37,6 +37,7 @@
@@ -103,7 +103,7 @@ index 820365c..fd61a9d 100644
        struct ib_sa_mad *mad;
  
 -      acm_log(2, "\n");
-+      acm_log_addr(2, "acm_resolve_path: ", dest->addr_type, dest->addr);
++      acm_log_addr(2, "acm_resolve_path: ", dest->addr_type, dest->address);
        msg = acm_alloc_send(ep, &ep->port->sa_dest, sizeof(*mad));
        if (!msg) {
                acm_log(0, "ERROR - cannot allocate send msg\n");
@@ -112,7 +112,7 @@ index 820365c..fd61a9d 100644
        int index;
  
 -      acm_log(2, "\n");
-+      acm_log_addr(2, "acm_record_acm_addr: ", dest->addr_type, dest->addr);
++      acm_log_addr(2, "acm_record_acm_addr: ", dest->addr_type, dest->address);
        index = acm_best_mc_index(ep, rec);
        if (index < 0) {
                acm_log(0, "ERROR - no shared multicast groups\n");
@@ -121,7 +121,7 @@ index 820365c..fd61a9d 100644
        struct acm_mad *mad;
  
 -      acm_log(2, "\n");
-+      acm_log_addr(2, "acm_send_addr_resp: ", dest->addr_type, dest->addr);
++      acm_log_addr(2, "acm_send_addr_resp: ", dest->addr_type, dest->address);
        msg = acm_alloc_send(ep, dest, sizeof (*mad));
        if (!msg) {
                acm_log(0, "ERROR - failed to allocate message\n");

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 8e5939a..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,40 +0,0 @@
-Bottom: 1df1d44b89d4161f2d3d3274603c0435ddfdd479
-Top:    93c6aab81f8d2dd6af9e1e1a410d245b3cc3db90
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-11-12 16:53:51 -0800
-
-Refresh of logging
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index fd61a9d..17eeb6e 100644
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -744,7 +744,7 @@ static uint8_t acm_resolve_path(struct acm_ep *ep, struct acm_dest *dest,
-       struct acm_send_msg *msg;
-       struct ib_sa_mad *mad;
- 
--      acm_log_addr(2, "acm_resolve_path: ", dest->addr_type, dest->addr);
-+      acm_log_addr(2, "acm_resolve_path: ", dest->addr_type, dest->address);
-       msg = acm_alloc_send(ep, &ep->port->sa_dest, sizeof(*mad));
-       if (!msg) {
-               acm_log(0, "ERROR - cannot allocate send msg\n");
-@@ -772,7 +772,7 @@ acm_record_acm_addr(struct acm_ep *ep, struct acm_dest *dest, struct ibv_wc *wc,
- {
-       int index;
- 
--      acm_log_addr(2, "acm_record_acm_addr: ", dest->addr_type, dest->addr);
-+      acm_log_addr(2, "acm_record_acm_addr: ", dest->addr_type, dest->address);
-       index = acm_best_mc_index(ep, rec);
-       if (index < 0) {
-               acm_log(0, "ERROR - no shared multicast groups\n");
-@@ -822,7 +822,7 @@ acm_send_addr_resp(struct acm_ep *ep, struct acm_dest *dest)
-       struct acm_send_msg *msg;
-       struct acm_mad *mad;
- 
--      acm_log_addr(2, "acm_send_addr_resp: ", dest->addr_type, dest->addr);
-+      acm_log_addr(2, "acm_send_addr_resp: ", dest->addr_type, dest->address);
-       msg = acm_alloc_send(ep, dest, sizeof (*mad));
-       if (!msg) {
-               acm_log(0, "ERROR - failed to allocate message\n");