commit

diff --git a/meta b/meta
index efcfd780d3832ca529386cd97d33a6e42de9862f..897181052f31e4cbaef269adfc02cef37181e571 100644 (file)
--- a/meta
+++ b/meta
@@ -1,8 +1,7 @@
 Version: 1
-Previous: e6d8790c3ea051be4a737fc6b70838f068deaab4
+Previous: 68a998702961a4ae410846c4ed277bb9520abe9c
 Head: 3b1f7191c890140c64eb9972876b4e56955a65ca
 Applied:
-  lmc: b355854c79a1e446e87684a41663ad5aae258b73
   lid: 0f9837af4f64eeeae8a4c168c8ccf47186c735d4
   acme_gid: 69a4139e95401a3100a2c363675fdd6d96a60d54
   range: 1a80d1d2efa888ad294bac3e681f744555d4e816

diff --git a/patches/lmc b/patches/lmc
deleted file mode 100644 (file)
index 01aabe4..0000000
--- a/patches/lmc
+++ /dev/null
@@ -1,44 +0,0 @@
-Bottom: 1fcbb0d2b361b8a2ed7ce1d4252ecc8c4be8ae71
-Top:    b2af32a606dc3c3e64f150250320dc7d52426926
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-12-15 17:23:26 -0800
-
-ibacm: fix lmc usage
-
-Convert lmc to actual mask for use in slid comparisons.  All SA
-queries are initiated from the base lid, so set the src_path_bits
-to 0.  It is currently set incorrectly based on using the lmc as
-a mask against the base lid.
-
-Signed-off-by: Sean Hefty <sean.hefty@intel.com>
-
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index 4ec01e8..e0f0b94 100644
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -112,7 +112,7 @@ struct acm_port
-       int                 gid_cnt;
-       uint16_t            pkey_cnt;
-       uint16_t            lid;
--      uint8_t             lmc;
-+      uint16_t            lid_mask;
-       uint8_t             port_num;
- };
- 
-@@ -2582,11 +2582,11 @@ static void acm_init_port(struct acm_port *port)
-                       break;
-       }
-       port->lid = attr.lid;
--      port->lmc = attr.lmc;
-+      port->lid_mask = 0xffff - (1 << attr.lmc) - 1;
- 
-       acm_init_dest(&port->sa_dest, ACM_ADDRESS_LID,
-               (uint8_t *) &attr.sm_lid, sizeof(attr.sm_lid));
--      port->sa_dest.av.src_path_bits = attr.lid & attr.lmc;
-+      port->sa_dest.av.src_path_bits = 0;
-       port->sa_dest.av.dlid = attr.sm_lid;
-       port->sa_dest.av.sl = attr.sm_sl;
-       port->sa_dest.av.port_num = port->port_num;