Signed off by: Alexander Naslednikov (xalex at mellanox.co.il) Index: B:/users/xalex/WoF-trunk/ulp/ipoib_NDIS6_CM/kernel/ipoib_xfr_mgr.h =================================================================== --- B:/users/xalex/WoF-trunk/ulp/ipoib_NDIS6_CM/kernel/ipoib_xfr_mgr.h (revision 3092) +++ B:/users/xalex/WoF-trunk/ulp/ipoib_NDIS6_CM/kernel/ipoib_xfr_mgr.h (working copy) @@ -446,36 +446,36 @@
/* Port guid is in network byte order. OUI is in lower 3
bytes. */
if( p_guid[0] == 0 && p_guid[1] == 0x02 && p_guid[2] == 0xc9 )
- {
- status =
ipoib_mac_from_mlx_guid( port_guid, p_mac_addr );
- }
+ {
+ status = ipoib_mac_from_mlx_guid( port_guid,
p_mac_addr );
+ }
else if( p_guid[0] == 0 && p_guid[1] == 0x08 && p_guid[2] ==
0xf1 )
- {
- status =
ipoib_mac_from_voltaire_guid( port_guid, p_mac_addr );
- }
+ {
+ status = ipoib_mac_from_voltaire_guid( port_guid,
p_mac_addr );
+ }
else if( p_guid[0] == 0 && p_guid[1] == 0x06 && p_guid[2] ==
0x6a )
+ {
+ status = ipoib_mac_from_sst_guid( port_guid,
p_mac_addr );
+ }
+ else
+ {
+ while( guid2mac_table[idx].second_byte != 0x00 ||
+ guid2mac_table[idx].third_byte
!= 0x00 ) //first byte can be equal to 0
{
- status =
ipoib_mac_from_sst_guid( port_guid, p_mac_addr );
- }
- else
- {
- while(
guid2mac_table[idx].second_byte != 0x00 ||
-
guid2mac_table[idx].third_byte != 0x00 ) //first byte can be equal to 0
- {
if( p_guid[0] ==
guid2mac_table[idx].first_byte &&
p_guid[1] ==
guid2mac_table[idx].second_byte &&
-
p_guid[2] == guid2mac_table[idx].third_byte )
- {
-
status = ipoib_mac_from_guid_mask(p_guid, guid2mac_table[idx].guid_mask,
-
p_mac_addr);
-
break;
- }
- ++idx;
+ p_guid[2] ==
guid2mac_table[idx].third_byte )
+ {
+ status =
ipoib_mac_from_guid_mask(p_guid, guid2mac_table[idx].guid_mask,
+
p_mac_addr);
+ break;
}
+ ++idx;
}
+ }
- if( status == IB_SUCCESS )
- return status;
+ if( status == IB_SUCCESS )
+ return status;
if( guid_mask )
return ipoib_mac_from_guid_mask( p_guid,
guid_mask, p_mac_addr );Alexander (XaleX) Naslednikov
SW Networking Team
Mellanox Technologies
_______________________________________________ ofw mailing list [email protected] http://lists.openfabrics.org/cgi-bin/mailman/listinfo/ofw
