narenas
/
opengnsys_ipxe
mirror of https://github.com/ipxe/ipxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[ipoib] Use Infiniband broadcast QPN in IPoIB broadcast MAC address 

Remove the special handling of the IPoIB broadcast QPN.
pull/1/head
Michael Brown 2009-07-07 11:31:35 +01:00
parent d6b47871de
commit 4d0029611f
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/drivers/net/ipoib.c
View File

@ -85,15 +85,9 @@ struct ipoib_device {
/** IPoIB metadata TID */ /** IPoIB metadata TID */
static uint32_t ipoib_meta_tid = 0; static uint32_t ipoib_meta_tid = 0;
/** Broadcast QPN used in IPoIB MAC addresses
*
* This is a guaranteed invalid real QPN
*/
#define IPOIB_BROADCAST_QPN 0xffffffffUL
/** Broadcast IPoIB address */ /** Broadcast IPoIB address */
static struct ipoib_mac ipoib_broadcast = { static struct ipoib_mac ipoib_broadcast = {
.qpn = ntohl ( IPOIB_BROADCAST_QPN ), .qpn = htonl ( IB_QPN_BROADCAST ),
.gid.u.bytes = { 0xff, 0x12, 0x40, 0x1b, 0x00, 0x00, 0x00, 0x00, .gid.u.bytes = { 0xff, 0x12, 0x40, 0x1b, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff }, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff },
}; };
@ -442,16 +436,15 @@ static int ipoib_transmit ( struct net_device *netdev,
/* Construct address vector */ /* Construct address vector */
memset ( &av, 0, sizeof ( av ) ); memset ( &av, 0, sizeof ( av ) );
av.qpn = ntohl ( dest->mac.qpn );
av.qkey = ipoib->data_qkey; av.qkey = ipoib->data_qkey;
av.gid_present = 1; av.gid_present = 1;
if ( dest->mac.qpn == htonl ( IPOIB_BROADCAST_QPN ) ) { if ( av.qpn == IB_QPN_BROADCAST ) {
/* Broadcast */ /* Broadcast */
av.qpn = IB_QPN_BROADCAST;
av.lid = ipoib->broadcast_lid; av.lid = ipoib->broadcast_lid;
memcpy ( &av.gid, &ipoib->broadcast_gid, sizeof ( av.gid ) ); memcpy ( &av.gid, &ipoib->broadcast_gid, sizeof ( av.gid ) );
} else { } else {
/* Unicast */ /* Unicast */
av.qpn = ntohl ( dest->mac.qpn );
memcpy ( &av.gid, &dest->mac.gid, sizeof ( av.gid ) ); memcpy ( &av.gid, &dest->mac.gid, sizeof ( av.gid ) );
if ( ( rc = ib_resolve_path ( ibdev, &av ) ) != 0 ) { if ( ( rc = ib_resolve_path ( ibdev, &av ) ) != 0 ) {
/* Path not resolved yet */ /* Path not resolved yet */