refresh (create temporary patch)

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

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..8e5939a
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,40 @@
+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");