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

[netdevice] Add "hwaddr" setting 

Expose the underlying hardware address as a setting.  For IPoIB
devices, this provides scripts with access to the Infiniband GUID.

Requested-by: Allen, Benjamin S. <bsallen@alcf.anl.gov>
Signed-off-by: Michael Brown <mcb30@ipxe.org>
pull/66/head
Michael Brown 2017-09-06 10:49:22 +01:00
parent 7e673a6b67
commit 8047baf7c6
1 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/net/netdev_settings.c
View File

@ -45,6 +45,11 @@ const struct setting mac_setting __setting ( SETTING_NETDEV, mac ) = {
.description = "MAC address", .description = "MAC address",
.type = &setting_type_hex, .type = &setting_type_hex,
}; };
const struct setting hwaddr_setting __setting ( SETTING_NETDEV, hwaddr ) = {
.name = "hwaddr",
.description = "Hardware address",
.type = &setting_type_hex,
};
const struct setting bustype_setting __setting ( SETTING_NETDEV, bustype ) = { const struct setting bustype_setting __setting ( SETTING_NETDEV, bustype ) = {
.name = "bustype", .name = "bustype",
.description = "Bus type", .description = "Bus type",
@ -78,7 +83,7 @@ const struct setting mtu_setting __setting ( SETTING_NETDEV, mtu ) = {
}; };
/** /**
* Store MAC address setting * Store link-layer address setting
* *
* @v netdev Network device * @v netdev Network device
* @v data Setting data, or NULL to clear setting * @v data Setting data, or NULL to clear setting
@ -103,7 +108,7 @@ static int netdev_store_mac ( struct net_device *netdev,
} }
/** /**
* Fetch MAC address setting * Fetch link-layer address setting
* *
* @v netdev Network device * @v netdev Network device
* @v data Buffer to fill with setting data * @v data Buffer to fill with setting data
@ -112,11 +117,30 @@ static int netdev_store_mac ( struct net_device *netdev,
*/ */
static int netdev_fetch_mac ( struct net_device *netdev, void *data, static int netdev_fetch_mac ( struct net_device *netdev, void *data,
size_t len ) { size_t len ) {
size_t max_len = netdev->ll_protocol->ll_addr_len;
if ( len > netdev->ll_protocol->ll_addr_len ) if ( len > max_len )
len = netdev->ll_protocol->ll_addr_len; len = max_len;
memcpy ( data, netdev->ll_addr, len ); memcpy ( data, netdev->ll_addr, len );
return netdev->ll_protocol->ll_addr_len; return max_len;
}
/**
* Fetch hardware address setting
*
* @v netdev Network device
* @v data Buffer to fill with setting data
* @v len Length of buffer
* @ret len Length of setting data, or negative error
*/
static int netdev_fetch_hwaddr ( struct net_device *netdev, void *data,
size_t len ) {
size_t max_len = netdev->ll_protocol->hw_addr_len;
if ( len > max_len )
len = max_len;
memcpy ( data, netdev->hw_addr, len );
return max_len;
} }
/** /**
@ -253,6 +277,7 @@ struct netdev_setting_operation {
/** Network device settings */ /** Network device settings */
static struct netdev_setting_operation netdev_setting_operations[] = { static struct netdev_setting_operation netdev_setting_operations[] = {
{ &mac_setting, netdev_store_mac, netdev_fetch_mac }, { &mac_setting, netdev_store_mac, netdev_fetch_mac },
{ &hwaddr_setting, NULL, netdev_fetch_hwaddr },
{ &bustype_setting, NULL, netdev_fetch_bustype }, { &bustype_setting, NULL, netdev_fetch_bustype },
{ &busloc_setting, NULL, netdev_fetch_busloc }, { &busloc_setting, NULL, netdev_fetch_busloc },
{ &busid_setting, NULL, netdev_fetch_busid }, { &busid_setting, NULL, netdev_fetch_busid },