From bf91bacf7fa78f39f438d01c94354fce3d6e73f6 Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Mon, 15 Nov 2010 14:06:17 -0800 Subject: [PATCH] refresh (create temporary patch) --- meta | 5 +++-- patches/refresh-temp | 31 +++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 patches/refresh-temp diff --git a/meta b/meta index 2626d3f..0b1fa64 100644 --- a/meta +++ b/meta @@ -1,11 +1,12 @@ Version: 1 -Previous: 892931b9fcc70a1cfff9be2c16ffd4678fafd02f -Head: 7ab0416fe32357aa71e979793de617d391d3aabb +Previous: b48826a6e12ff851f3b678b68561d38dcdef3960 +Head: 9d6b4f86c1b92e4ebd98b356111ec4f4f7afe691 Applied: logging: 88d1bcda7ee4d64fe55e1e639cd485422a30c23b logging2: b69e982755c03636396faab8b31f5359e5a67a6b acm_snoop: a8dc60dcbdd2ab3da998585bc84770e6d59f0114 ibacm-display-lid-and-gid-addr: 7ab0416fe32357aa71e979793de617d391d3aabb + refresh-temp: 9d6b4f86c1b92e4ebd98b356111ec4f4f7afe691 Unapplied: loopback: 8c3473645ff2d6097b6a9c351a726ea48c1d8165 Hidden: diff --git a/patches/refresh-temp b/patches/refresh-temp new file mode 100644 index 0000000..2c79cd1 --- /dev/null +++ b/patches/refresh-temp @@ -0,0 +1,31 @@ +Bottom: a73356f8275f4ece6f73baa1869b2fcabd14f560 +Top: 9962a940efd219c52418715f8e1c4d496699b292 +Author: Sean Hefty +Date: 2010-11-15 14:06:17 -0800 + +Refresh of ibacm-display-lid-and-gid-addr + +--- + +diff --git a/src/acm.c b/src/acm.c +index 51836a8..daa0985 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); + } -- 2.46.0