refresh

diff --git a/meta b/meta
index 0b1fa648e949edc25e35c848c399a5f64216cb30..f18b851d06d03f586e07ac0b334854edb16d8c5f 100644 (file)
--- a/meta
+++ b/meta
@@ -1,12 +1,11 @@
 Version: 1
-Previous: b48826a6e12ff851f3b678b68561d38dcdef3960
-Head: 9d6b4f86c1b92e4ebd98b356111ec4f4f7afe691
+Previous: af8cac0429c49252ee30fe89a150e9a818d7ca0b
+Head: a447930f64695cb689443978bf381f00a60eac03
 Applied:
   logging: 88d1bcda7ee4d64fe55e1e639cd485422a30c23b
   logging2: b69e982755c03636396faab8b31f5359e5a67a6b
   acm_snoop: a8dc60dcbdd2ab3da998585bc84770e6d59f0114
-  ibacm-display-lid-and-gid-addr: 7ab0416fe32357aa71e979793de617d391d3aabb
-  refresh-temp: 9d6b4f86c1b92e4ebd98b356111ec4f4f7afe691
+  ibacm-display-lid-and-gid-addr: a447930f64695cb689443978bf381f00a60eac03
 Unapplied:
   loopback: 8c3473645ff2d6097b6a9c351a726ea48c1d8165
 Hidden:

diff --git a/patches/ibacm-display-lid-and-gid-addr b/patches/ibacm-display-lid-and-gid-addr
index 4512dc191b657d549bd0e43fde18cb743c16fa7b..8684eba3cfe5b7077cb9460db6fc3ad4ec9edfd2 100644 (file)
--- a/patches/ibacm-display-lid-and-gid-addr
+++ b/patches/ibacm-display-lid-and-gid-addr
@@ -1,5 +1,5 @@
 Bottom: a73356f8275f4ece6f73baa1869b2fcabd14f560
-Top:    a73356f8275f4ece6f73baa1869b2fcabd14f560
+Top:    9962a940efd219c52418715f8e1c4d496699b292
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-11-15 14:05:45 -0800
 
@@ -14,4 +14,25 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+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);
+       }

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 2c79cd1..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,31 +0,0 @@
-Bottom: a73356f8275f4ece6f73baa1869b2fcabd14f560
-Top:    9962a940efd219c52418715f8e1c4d496699b292
-Author: Sean Hefty <sean.hefty@intel.com>
-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);
-       }