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

[netdevice] Allow driver to preinitialise the link-layer address 

Drivers are currently expected to initialise only the hardware
address, with the link-layer protocol code taking care of converting
this into a valid link-layer address.  Some drivers (e.g. undinet) can
legitimately determine both the hardware and link-layer addresses,
which may differ.

Allow for this situation by checking to see if the link-layer address
is empty before initialising it from the hardware address.

Signed-off-by: Michael Brown <mcb30@ipxe.org>
pull/5/head
Michael Brown 2011-10-28 22:32:33 +01:00
parent b0d65b5f0c
commit 4f4369064b
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/net/netdevice.c
View File

@ -62,6 +62,23 @@ struct errortab netdev_errors[] __errortab = {
__einfo_errortab ( EINFO_ENOTCONN_LINK_DOWN ), __einfo_errortab ( EINFO_ENOTCONN_LINK_DOWN ),
}; };
/**
* Check whether or not network device has a link-layer address
*
* @v netdev Network device
* @ret has_ll_addr Network device has a link-layer address
*/
static int netdev_has_ll_addr ( struct net_device *netdev ) {
uint8_t *ll_addr = netdev->ll_addr;
size_t remaining = sizeof ( netdev->ll_addr );
while ( remaining-- ) {
if ( *(ll_addr++) != 0 )
return 1;
}
return 0;
}
/** /**
* Notify drivers of network device or link state change * Notify drivers of network device or link state change
* *
@ -432,8 +449,11 @@ int register_netdev ( struct net_device *netdev ) {
ifindex++ ); ifindex++ );
} }
/* Set initial link-layer address */ /* Set initial link-layer address, if not already set */
netdev->ll_protocol->init_addr ( netdev->hw_addr, netdev->ll_addr ); if ( ! netdev_has_ll_addr ( netdev ) ) {
netdev->ll_protocol->init_addr ( netdev->hw_addr,
netdev->ll_addr );
}
/* Add to device list */ /* Add to device list */
netdev_get ( netdev ); netdev_get ( netdev );