commit

diff --git a/meta b/meta
index 954c2b50351bd2fefd479b82a0f7ce534d8d30d2..ab477a1bf0e1a77a8c0dad86bc1ad798a0b9f072 100644 (file)
--- a/meta
+++ b/meta
@@ -1,8 +1,7 @@
 Version: 1
-Previous: 12b809026bd92808a9cdd43680901cbc69fc8b28
+Previous: 21429dbce2309ef28a8b5fa12eefbe60ee86c3bf
 Head: 3b1f7191c890140c64eb9972876b4e56955a65ca
 Applied:
-  format_lid: 3d001d786a9894e9a7e86932685e7c43568484b5
   query_path: 3b1f7191c890140c64eb9972876b4e56955a65ca
 Unapplied:
   addr_size: 8de02c47fbf595132105a7050ad6f755f49f9a7a

diff --git a/patches/format_lid b/patches/format_lid
deleted file mode 100644 (file)
index 830a2f5..0000000
--- a/patches/format_lid
+++ /dev/null
@@ -1,25 +0,0 @@
-Bottom: 95be46d944a0b8ad21ebe86340c99c1691ee887f
-Top:    51e1d4efb38c4166735d2f14c94b3c842483435a
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-12-17 12:10:14 -0800
-
-ibacm: Convert LID name to host order
-
-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");