diff options
| author | Michael Brown | 2009-10-23 23:18:04 +0200 |
|---|---|---|
| committer | Michael Brown | 2009-10-23 23:18:23 +0200 |
| commit | 45044acea7422d976ff338ef3b82dda805c20bc5 (patch) | |
| tree | 4a9290a3aee00abf7fcb720ee2c7b1bfe425def4 /src | |
| parent | [netdevice] Add the concept of an "Ethernet-compatible" MAC address (diff) | |
| download | ipxe-45044acea7422d976ff338ef3b82dda805c20bc5.tar.gz ipxe-45044acea7422d976ff338ef3b82dda805c20bc5.tar.xz ipxe-45044acea7422d976ff338ef3b82dda805c20bc5.zip | |
[iscsi] Use the "Ethernet-compatible" MAC address in the iBFT
Diffstat (limited to 'src')
| -rw-r--r-- | src/arch/i386/interface/pcbios/ibft.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/arch/i386/interface/pcbios/ibft.c b/src/arch/i386/interface/pcbios/ibft.c index e0baaa219..adf8e6b9d 100644 --- a/src/arch/i386/interface/pcbios/ibft.c +++ b/src/arch/i386/interface/pcbios/ibft.c @@ -37,6 +37,7 @@ FILE_LICENCE ( BSD2 ); #include <gpxe/acpi.h> #include <gpxe/in.h> #include <gpxe/netdevice.h> +#include <gpxe/ethernet.h> #include <gpxe/dhcp.h> #include <gpxe/iscsi.h> #include <gpxe/ibft.h> @@ -251,6 +252,7 @@ static const char * ibft_string ( struct ibft_string_block *strings, static int ibft_fill_nic ( struct ibft_nic *nic, struct ibft_string_block *strings, struct net_device *netdev ) { + struct ll_protocol *ll_protocol = netdev->ll_protocol; struct in_addr netmask_addr = { 0 }; unsigned int netmask_count = 0; int rc; @@ -279,10 +281,12 @@ static int ibft_fill_nic ( struct ibft_nic *nic, DBG ( "iBFT NIC subnet = /%d\n", nic->subnet_mask_prefix ); /* Extract values from net-device configuration */ - memcpy ( nic->mac_address, netdev->ll_addr, - sizeof ( nic->mac_address ) ); - DBG ( "iBFT NIC MAC = %s\n", - netdev->ll_protocol->ntoa ( nic->mac_address ) ); + if ( ( rc = ll_protocol->eth_addr ( netdev->ll_addr, + nic->mac_address ) ) != 0 ) { + DBG ( "Could not determine iBFT MAC: %s\n", strerror ( rc ) ); + return rc; + } + DBG ( "iBFT NIC MAC = %s\n", eth_ntoa ( nic->mac_address ) ); nic->pci_bus_dev_func = netdev->dev->desc.location; DBG ( "iBFT NIC PCI = %04x\n", nic->pci_bus_dev_func ); |