refresh

diff --git a/meta b/meta
index 0b15bb5a4e518a0d0c310055d4a944a6e6c14002..58f21858d0a17ded1db173df5fdf9f7b4545dd09 100644 (file)
--- a/meta
+++ b/meta
@@ -1,12 +1,11 @@
 Version: 1
-Previous: 9c14a5fba1fc835cf28a5712abf5ff561a2b4193
-Head: e2d5db76226b03a12c38af4f8908fb12eeee6a16
+Previous: a224dabb28acdfb2cacf3b254c86797e9bd2689e
+Head: 8994e17d78c86c08edcc8067dda7392a97cc8a3f
 Applied:
   lmc: b355854c79a1e446e87684a41663ad5aae258b73
   lid: 1c005908ee6c257f6fa290df8ce8a45e968d07ab
   acme_gid: 160551b2a4bed277f4c81b52ef33a184f43ca783
   range: dfe3c8409e2e1fcc2fc11bd7f9287f1c46b36015
-  format_lid: 10e1ac8952a7c7eedc58b57964e11460e1aa6db4
-  refresh-temp: e2d5db76226b03a12c38af4f8908fb12eeee6a16
+  format_lid: 8994e17d78c86c08edcc8067dda7392a97cc8a3f
 Unapplied:
 Hidden:

diff --git a/patches/format_lid b/patches/format_lid
index f6d01dd4bf087ec91247229c8722112fe5479b9c..830a2f5bb84555d45f6b1f8a290b9901d7b45c24 100644 (file)
--- a/patches/format_lid
+++ b/patches/format_lid
@@ -1,5 +1,5 @@
 Bottom: 95be46d944a0b8ad21ebe86340c99c1691ee887f
-Top:    95be46d944a0b8ad21ebe86340c99c1691ee887f
+Top:    51e1d4efb38c4166735d2f14c94b3c842483435a
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-12-17 12:10:14 -0800
 
@@ -10,4 +10,16 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/src/acm.c b/src/acm.c
+index b4e0632..ed1cb28 100644
+--- a/src/acm.c
++++ b/src/acm.c
+@@ -277,7 +277,7 @@ acm_format_name(int level, char *name, size_t name_size,
+               }
+               break;
+       case ACM_ADDRESS_LID:
+-              sprintf(name, "LID(%d)", *((uint16_t *) addr));
++              sprintf(name, "LID(%d)", ntohs(*((uint16_t *) addr)));
+               break;
+       default:
+               strcpy(name, "Unknown");

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index baa34f0..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: 95be46d944a0b8ad21ebe86340c99c1691ee887f
-Top:    51e1d4efb38c4166735d2f14c94b3c842483435a
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-12-17 12:29:29 -0800
-
-Refresh of format_lid
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index b4e0632..ed1cb28 100644
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -277,7 +277,7 @@ acm_format_name(int level, char *name, size_t name_size,
-               }
-               break;
-       case ACM_ADDRESS_LID:
--              sprintf(name, "LID(%d)", *((uint16_t *) addr));
-+              sprintf(name, "LID(%d)", ntohs(*((uint16_t *) addr)));
-               break;
-       default:
-               strcpy(name, "Unknown");