refresh

diff --git a/meta b/meta
index f608a130e038681acb74e44090018d97955035fc..91fd56516558d66a1cd0c88d534ede9fd0743d2b 100644 (file)
--- a/meta
+++ b/meta
@@ -1,12 +1,11 @@
 Version: 1
-Previous: 2003aa355be5573824f1dc566accef24e976ecba
-Head: dbecd3134620feea40abb0dc0aef4285e175123b
+Previous: 0c0e7351af2f4d272e44e5541a022009ea120e2c
+Head: 3ecca436895c8c9116916121939321a15261f573
 Applied:
   acm_snoop: 6d9b27b37026f9090ad55a36f26814f90f3772dd
   log_lid: 6ac592a74d5289b4800c84ef8c20e8ff3f2f263e
   logging: 4ca254f3d8fda6ae709f0c38461f75b9677fa5df
-  dest_string: 338aa2a7e68f2cb32cb6d43d1ac4f837b3df2e6f
-  refresh-temp: dbecd3134620feea40abb0dc0aef4285e175123b
+  dest_string: 3ecca436895c8c9116916121939321a15261f573
 Unapplied:
   loopback: 8c3473645ff2d6097b6a9c351a726ea48c1d8165
 Hidden:

diff --git a/patches/dest_string b/patches/dest_string
index c163991cfd8f2f780a76904413e098505d5237e4..260a2985bc2a43ec8841c5fea1e60c022357021c 100644 (file)
--- a/patches/dest_string
+++ b/patches/dest_string
@@ -1,5 +1,5 @@
 Bottom: 9962a940efd219c52418715f8e1c4d496699b292
-Top:    27691ed590ac790c78441a99f97e4ba9c02ec348
+Top:    48ae6ff2a380848c5f40322be0215170a36b49bf
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-11-15 14:42:59 -0800
 
@@ -28,7 +28,7 @@ index 28c3647..33ea842 100644
  {\r
        pthread_t thread;\r
 diff --git a/src/acm.c b/src/acm.c
-index daa0985..fa915f1 100644
+index daa0985..e27aa25 100644
 --- a/src/acm.c
 +++ b/src/acm.c
 @@ -75,6 +75,7 @@ enum acm_route_prot
@@ -99,7 +99,7 @@ index daa0985..fa915f1 100644
                break;
        case ACM_ADDRESS_LID:
 -              fprintf(flog, "LID 0x%x\n", *((uint16_t *) addr));
-+              sprintf(name, "LID(%d)\n", *((uint16_t *) addr));
++              sprintf(name, "LID(%d)", *((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 6cec2f7..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: 27691ed590ac790c78441a99f97e4ba9c02ec348
-Top:    48ae6ff2a380848c5f40322be0215170a36b49bf
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-11-15 17:28:57 -0800
-
-Refresh of dest_string
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index fa915f1..e27aa25 100644
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -261,7 +261,7 @@ acm_format_name(int level, char *name, size_t name_size,
-                       ntohs(path->slid), ntohs(path->dlid));
-               break;
-       case ACM_ADDRESS_LID:
--              sprintf(name, "LID(%d)\n", *((uint16_t *) addr));
-+              sprintf(name, "LID(%d)", *((uint16_t *) addr));
-               break;
-       default:
-               strcpy(name, "Unknown");