diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2010-02-03 16:06:41 -0800 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2010-02-03 16:06:41 -0800 |
| commit | addaeaeb3949d576c4e0eb5cfc133b7c3bcfa8fa (patch) | |
| tree | 2ffea726dc494e87ecc9f506bc6a2bc9242730e3 /gpxe/src/drivers/net/legacy.c | |
| parent | 5c0f48e49f8d7d084810ecf0b98a76aaebb44835 (diff) | |
| parent | e7a5f95432132c8fc8f8ede39fda1d368002ddd8 (diff) | |
| download | syslinux.git-addaeaeb3949d576c4e0eb5cfc133b7c3bcfa8fa.tar.gz syslinux.git-addaeaeb3949d576c4e0eb5cfc133b7c3bcfa8fa.tar.xz syslinux.git-addaeaeb3949d576c4e0eb5cfc133b7c3bcfa8fa.zip | |
Merge branch 'master' into i915res
Diffstat (limited to 'gpxe/src/drivers/net/legacy.c')
| -rw-r--r-- | gpxe/src/drivers/net/legacy.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gpxe/src/drivers/net/legacy.c b/gpxe/src/drivers/net/legacy.c index cbec3cf5..79b3580a 100644 --- a/gpxe/src/drivers/net/legacy.c +++ b/gpxe/src/drivers/net/legacy.c @@ -17,6 +17,8 @@ * */ +FILE_LICENCE ( GPL2_OR_LATER ); + struct nic nic; static int legacy_registered = 0; @@ -97,7 +99,7 @@ int legacy_probe ( void *hwdev, set_drvdata ( hwdev, netdev ); netdev->dev = dev; - nic.node_addr = netdev->ll_addr; + nic.node_addr = netdev->hw_addr; nic.irqno = dev->desc.irq; if ( ! probe ( &nic, hwdev ) ) { @@ -120,7 +122,7 @@ int legacy_probe ( void *hwdev, /* Do not remove this message */ printf ( "WARNING: Using legacy NIC wrapper on %s\n", - ethernet_protocol.ntoa ( nic.node_addr ) ); + netdev->ll_protocol->ntoa ( nic.node_addr ) ); legacy_registered = 1; return 0; |