refresh

diff --git a/meta b/meta
index e52a5227f1ff7e4c2404a7d20d931fc4c79edec9..95a16576bf95d5a01527533516b89138569f8544 100644 (file)
--- a/meta
+++ b/meta
@@ -1,11 +1,10 @@
 Version: 1
-Previous: d5e02b65c102d63b779bcd8c52d0eeae6a9f7fd7
-Head: 278ed7acd7bc8138a22ceb6aa90a165de5ecf47e
+Previous: 9074b6a305bae8a46258fb34387c3eb6c9c9d15e
+Head: b2815aaa29317cb3a18172e5692a6b1ad3361478
 Applied:
   logging: 88d1bcda7ee4d64fe55e1e639cd485422a30c23b
   acm_snoop: bfcb41cccea5442ff7996133c7dd8e11362b041e
-  logging2: 9919a1d954f16ef29ae5d9674855c61710af5a27
-  refresh-temp: 278ed7acd7bc8138a22ceb6aa90a165de5ecf47e
+  logging2: b2815aaa29317cb3a18172e5692a6b1ad3361478
 Unapplied:
   loopback: 8c3473645ff2d6097b6a9c351a726ea48c1d8165
 Hidden:

diff --git a/patches/logging2 b/patches/logging2
index 8e6924af729613daa835820d64eba7fe06725099..401499f0d3b8499a08ffe19c950c7af6ba18fae0 100644 (file)
--- a/patches/logging2
+++ b/patches/logging2
@@ -1,5 +1,5 @@
 Bottom: 0f063c91893feaff89b12fc524a41fee5462240a
-Top:    9962a940efd219c52418715f8e1c4d496699b292
+Top:    a73356f8275f4ece6f73baa1869b2fcabd14f560
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-11-15 12:37:47 -0800
 
@@ -11,28 +11,10 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/acm.c b/src/acm.c
-index 41eb64e..daa0985 100644
+index 41eb64e..51836a8 100644
 --- a/src/acm.c
 +++ b/src/acm.c
-@@ -254,6 +254,7 @@ static void acm_log_addr(int level, const char *msg, uint16_t addr_type, uint8_t
-               fprintf(flog, "%s\n", ip_addr);
-               break;
-       case ACM_EP_INFO_ADDRESS_IP6:
-+      case ACM_ADDRESS_GID:
-               inet_ntop(AF_INET6, addr, ip_addr, ACM_MAX_ADDRESS);
-               fprintf(flog, "%s\n", ip_addr);
-               break;
-@@ -262,6 +263,9 @@ static void acm_log_addr(int level, const char *msg, uint16_t addr_type, uint8_t
-               fprintf(flog, "path record, SLID 0x%x, DLID 0x%x\n",
-                       ntohs(path->slid), ntohs(path->dlid));
-               break;
-+      case ACM_ADDRESS_LID:
-+              fprintf(flog, "LID 0x%x\n", *((uint16_t *) addr));
-+              break;
-       default:
-               fprintf(flog, "unknown address 0x%x\n", addr_type);
-       }
-@@ -908,7 +912,7 @@ acm_complete_queued_req(struct acm_dest *dest, uint8_t status)
+@@ -908,7 +908,7 @@ acm_complete_queued_req(struct acm_dest *dest, uint8_t status)
                req = container_of(entry, struct acm_request, entry);
                lock_release(&dest->lock);
  
@@ -41,7 +23,7 @@ index 41eb64e..daa0985 100644
                acm_client_resolve_resp(req->client,
                        (struct acm_resolve_msg *) &req->msg, dest, status);
                acm_free_req(req);
-@@ -931,9 +935,11 @@ acm_dest_sa_resp(struct acm_send_msg *msg, struct ibv_wc *wc, struct acm_mad *ma
+@@ -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);

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index e210492..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,31 +0,0 @@
-Bottom: 9962a940efd219c52418715f8e1c4d496699b292
-Top:    a73356f8275f4ece6f73baa1869b2fcabd14f560
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-11-15 14:04:11 -0800
-
-Refresh of logging2
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index daa0985..51836a8 100644
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -254,7 +254,6 @@ static void acm_log_addr(int level, const char *msg, uint16_t addr_type, uint8_t
-               fprintf(flog, "%s\n", ip_addr);
-               break;
-       case ACM_EP_INFO_ADDRESS_IP6:
--      case ACM_ADDRESS_GID:
-               inet_ntop(AF_INET6, addr, ip_addr, ACM_MAX_ADDRESS);
-               fprintf(flog, "%s\n", ip_addr);
-               break;
-@@ -263,9 +262,6 @@ static void acm_log_addr(int level, const char *msg, uint16_t addr_type, uint8_t
-               fprintf(flog, "path record, SLID 0x%x, DLID 0x%x\n",
-                       ntohs(path->slid), ntohs(path->dlid));
-               break;
--      case ACM_ADDRESS_LID:
--              fprintf(flog, "LID 0x%x\n", *((uint16_t *) addr));
--              break;
-       default:
-               fprintf(flog, "unknown address 0x%x\n", addr_type);
-       }