refresh

diff --git a/meta b/meta
index 75fa049d3ec736c8dc4806d9c4bc0292577a859f..150d35d29200f5c9cffd043dc9de5e0f2b47259a 100644 (file)
--- a/meta
+++ b/meta
@@ -1,12 +1,11 @@
 Version: 1
-Previous: 16fba406f95c33f94967be0e18a7ff74eb4de8e7
-Head: ba0ac2afbe6301dabef10b1d3eec7d853bf8cd65
+Previous: 234cabc7879f3350734eadc0cf12b828de7bedff
+Head: 1cccc232e596e4b967713c2d190133739b60c772
 Applied:
   addr_open: 1fd2bfd86e2e2fe78f9d5d6d39aa5502938923f0
   open_dev: 4687a6571146acd8d9a1553a96e2e4f7e8318761
   ep_active: 77fc3b61749ca5785e28bf487a5df84189466ecb
-  sm_lid: 40cb282beea5b32338c8bee9c609a780bd1393d5
-  refresh-temp: ba0ac2afbe6301dabef10b1d3eec7d853bf8cd65
+  sm_lid: 1cccc232e596e4b967713c2d190133739b60c772
 Unapplied:
   autoaddr: 36281f18de15f2482e21ae1304f2e34e9ecf187d
   async_mc: c51c6e84981821b2541daba97cee9a29cd1d3709

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 367b083..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: 74c254a77501b64753142f1e530134e5ffa86d53
-Top:    d539114b2e637e2c9ec4181ab8625e3435664ed5
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2011-02-10 12:09:09 -0800
-
-Refresh of sm_lid
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index 10680f8..ccad45d 100644
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -2638,7 +2638,7 @@ static void acm_port_up(struct acm_port *port)
-       port->lid_mask = 0xffff - ((1 << attr.lmc) - 1);
- 
-       acm_set_dest_addr(&port->sa_dest, ACM_ADDRESS_LID,
--              (uint8_t *) &attr.sm_lid, sizeof(attr.sm_lid));
-+              (uint16_t *) &attr.sm_lid, sizeof(attr.sm_lid));
-       port->sa_dest.av.src_path_bits = 0;
-       port->sa_dest.av.dlid = attr.sm_lid;
-       port->sa_dest.av.sl = attr.sm_sl;

diff --git a/patches/sm_lid b/patches/sm_lid
index f0c7691c7c5d6fff8dfe1246d905ca66e046ebe0..7206d55deb795cf42cf0cac8fd1aa153a936431a 100644 (file)
--- a/patches/sm_lid
+++ b/patches/sm_lid
@@ -1,13 +1,27 @@
 Bottom: 74c254a77501b64753142f1e530134e5ffa86d53
-Top:    74c254a77501b64753142f1e530134e5ffa86d53
+Top:    d539114b2e637e2c9ec4181ab8625e3435664ed5
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2011-02-10 12:06:46 -0800
 
-Save and display SM LID name in host order
+Cast SM LID to uint16, not uint8
+
+This fixes the LID value when entered into the ibacm log.
 
 Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 
 ---
 
-
+diff --git a/src/acm.c b/src/acm.c
+index 10680f8..ccad45d 100644
+--- a/src/acm.c
++++ b/src/acm.c
+@@ -2638,7 +2638,7 @@ static void acm_port_up(struct acm_port *port)
+       port->lid_mask = 0xffff - ((1 << attr.lmc) - 1);
+ 
+       acm_set_dest_addr(&port->sa_dest, ACM_ADDRESS_LID,
+-              (uint8_t *) &attr.sm_lid, sizeof(attr.sm_lid));
++              (uint16_t *) &attr.sm_lid, sizeof(attr.sm_lid));
+       port->sa_dest.av.src_path_bits = 0;
+       port->sa_dest.av.dlid = attr.sm_lid;
+       port->sa_dest.av.sl = attr.sm_sl;