[openib-general] [PATCH] OpenSM/osm_state_mgr.c: Fix device ID and vendor ID in topology file

[Hal Rosenstock]

OpenSM/osm_state_mgr.c: Fix device ID and vendor ID in topology file
Device ID is 16 bits and Vendor ID is 24 bits

Signed-off-by: Hal Rosenstock <halr at voltaire.com>

Index: opensm/osm_state_mgr.c
===================================================================
--- opensm/osm_state_mgr.c	(revision 10147)
+++ opensm/osm_state_mgr.c	(working copy)
@@ -1145,7 +1145,7 @@ __osm_topology_file_create(
                      " SystemGUID:%016" PRIx64
                      " NodeGUID:%016" PRIx64
                      " PortGUID:%016" PRIx64
-                     " VenID:%08X DevID:%04X Rev:%08X {%s} LID:%04X PN:%02X } ",
+                     " VenID:%06X DevID:%04X Rev:%08X {%s} LID:%04X PN:%02X } ",
                      ( p_node->node_info.node_type ==
                        IB_NODE_TYPE_SWITCH ) ? "SW" : ( p_node->node_info.
                                                         node_type ==
@@ -1161,7 +1161,7 @@ __osm_topology_file_create(
                      cl_ntoh64( p_physp->port_guid ),
                      cl_ntoh32( ib_node_info_get_vendor_id
                                 ( &p_node->node_info ) ),
-                     cl_ntoh32( p_node->node_info.device_id ),
+                     cl_ntoh16( p_node->node_info.device_id ),
                      cl_ntoh32( p_node->node_info.revision ),
                      desc,
                      cl_ntoh16( p_default_physp->port_info.base_lid ),