diff options
| author | Michael Brown <mcb30@etherboot.org> | 2009-08-11 20:19:53 +0100 |
|---|---|---|
| committer | Michael Brown <mcb30@etherboot.org> | 2009-08-12 00:19:14 +0100 |
| commit | 37a0aab4ff2c86f4d109d4cd479535be97d07a94 (patch) | |
| tree | 5a2f06a22cf2c647b36d254fc1699072c3c88392 /src/usr | |
| parent | b3db99a38d8822f29eae6f67ee6034c57284d06f (diff) | |
| download | ipxe-37a0aab4ff2c86f4d109d4cd479535be97d07a94.tar.gz | |
[netdevice] Separate out the concept of hardware and link-layer addresses
The hardware address is an intrinsic property of the hardware, while
the link-layer address can be changed at runtime. This separation is
exposed via APIs such as PXE and EFI, but is currently elided by gPXE.
Expose the hardware and link-layer addresses as separate properties
within a net device. Drivers should now fill in hw_addr, which will
be used to initialise ll_addr at the time of calling
register_netdev().
Diffstat (limited to 'src/usr')
| -rw-r--r-- | src/usr/dhcpmgmt.c | 2 | ||||
| -rw-r--r-- | src/usr/ifmgmt.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/usr/dhcpmgmt.c b/src/usr/dhcpmgmt.c index c1cc36eff..d98aa9f4a 100644 --- a/src/usr/dhcpmgmt.c +++ b/src/usr/dhcpmgmt.c @@ -48,7 +48,7 @@ int dhcp ( struct net_device *netdev ) { return rc; /* Perform DHCP */ - printf ( "DHCP (%s %s)", netdev->name, netdev_hwaddr ( netdev ) ); + printf ( "DHCP (%s %s)", netdev->name, netdev_addr ( netdev ) ); if ( ( rc = start_dhcp ( &monojob, netdev ) ) == 0 ) rc = monojob_wait ( "" ); diff --git a/src/usr/ifmgmt.c b/src/usr/ifmgmt.c index 97cde4a0f..d4cc5a5b6 100644 --- a/src/usr/ifmgmt.c +++ b/src/usr/ifmgmt.c @@ -89,7 +89,7 @@ static void ifstat_errors ( struct net_device_stats *stats, void ifstat ( struct net_device *netdev ) { printf ( "%s: %s on %s (%s)\n" " [Link:%s, TX:%d TXE:%d RX:%d RXE:%d]\n", - netdev->name, netdev_hwaddr ( netdev ), netdev->dev->name, + netdev->name, netdev_addr ( netdev ), netdev->dev->name, ( ( netdev->state & NETDEV_OPEN ) ? "open" : "closed" ), ( netdev_link_ok ( netdev ) ? "up" : "down" ), netdev->tx_stats.good, netdev->tx_stats.bad, |