[openib-general] [PATCH 13/13] osm: port to WinIB stack : opensm/osm_pkey_mgr.c

[Eitan Zahavi]

Hi Hal

Avoid using array initialization statements which do not compile on win.

Thanks

Eitan

Signed-off-by:  Eitan Zahavi <[EMAIL PROTECTED]>

Index: opensm/osm_pkey_mgr.c
===================================================================
--- opensm/osm_pkey_mgr.c       (revision 9502)
+++ opensm/osm_pkey_mgr.c       (working copy)
@@ -67,7 +67,7 @@
   a different place for switch external ports (SwitchInfo) and the
   rest of the ports (NodeInfo).
 */
-static int 
+static uint16_t
 pkey_mgr_get_physp_max_blocks(
   IN const osm_subn_t *p_subn,
   IN const osm_physp_t *p_physp )
@@ -132,8 +132,8 @@ pkey_mgr_process_physical_port(
     CL_ASSERT( ib_pkey_get_base( *p_orig_pkey ) == ib_pkey_get_base( pkey ) );
     p_pending->is_new = FALSE;
     if (osm_pkey_tbl_get_block_and_idx(
-         p_pkey_tbl, p_orig_pkey,
-         &p_pending->block, &p_pending->index ) != IB_SUCCESS)
+                         p_pkey_tbl, p_orig_pkey,
+                         &p_pending->block, &p_pending->index ) != IB_SUCCESS)
     {
       osm_log( p_log, OSM_LOG_ERROR,
               "pkey_mgr_process_physical_port: ERR 0503: "
@@ -276,7 +276,8 @@ static boolean_t pkey_mgr_update_port(
   boolean_t ret_val = FALSE;
   osm_pending_pkey_t *p_pending;
   boolean_t found;
-  ib_pkey_table_t empty_block = {.pkey_entry = {0}, };
+  ib_pkey_table_t empty_block;
+  memset(&empty_block, 0, sizeof(ib_pkey_table_t));
 
   p_physp = osm_port_get_default_phys_ptr( p_port );
   if ( !osm_physp_is_valid( p_physp ) )
@@ -403,7 +404,8 @@ pkey_mgr_update_peer_port(
   uint16_t peer_max_blocks;
   ib_api_status_t status = IB_SUCCESS;
   boolean_t ret_val = FALSE;
-  ib_pkey_table_t empty_block = {.pkey_entry = {0}, };
+  ib_pkey_table_t empty_block;
+  memset(&empty_block, 0, sizeof(ib_pkey_table_t));
 
   p_physp = osm_port_get_default_phys_ptr( p_port );
   if (!osm_physp_is_valid( p_physp ))


_______________________________________________
openib-general mailing list
openib-general@openib.org
http://openib.org/mailman/listinfo/openib-general

To unsubscribe, please visit http://openib.org/mailman/listinfo/openib-general