aboutsummaryrefslogtreecommitdiffstats
path: root/gpxe/src/drivers/net/b44.c
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2010-02-03 16:06:41 -0800
committerH. Peter Anvin <hpa@zytor.com>2010-02-03 16:06:41 -0800
commitaddaeaeb3949d576c4e0eb5cfc133b7c3bcfa8fa (patch)
tree2ffea726dc494e87ecc9f506bc6a2bc9242730e3 /gpxe/src/drivers/net/b44.c
parent5c0f48e49f8d7d084810ecf0b98a76aaebb44835 (diff)
parente7a5f95432132c8fc8f8ede39fda1d368002ddd8 (diff)
downloadsyslinux.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/b44.c')
-rw-r--r--gpxe/src/drivers/net/b44.c20
1 files changed, 11 insertions, 9 deletions
diff --git a/gpxe/src/drivers/net/b44.c b/gpxe/src/drivers/net/b44.c
index 4c9c8e6e..c48b3144 100644
--- a/gpxe/src/drivers/net/b44.c
+++ b/gpxe/src/drivers/net/b44.c
@@ -28,6 +28,8 @@
* Copyright (c) a lot of people too. Please respect their work.
*/
+FILE_LICENCE ( GPL2_OR_LATER );
+
#include <errno.h>
#include <assert.h>
#include <stdio.h>
@@ -592,12 +594,12 @@ static void b44_load_mac_and_phy_addr(struct b44_private *bp)
/* Load MAC address, note byteswapping */
b44_read_eeprom(bp, &eeprom[0]);
- bp->netdev->ll_addr[0] = eeprom[79];
- bp->netdev->ll_addr[1] = eeprom[78];
- bp->netdev->ll_addr[2] = eeprom[81];
- bp->netdev->ll_addr[3] = eeprom[80];
- bp->netdev->ll_addr[4] = eeprom[83];
- bp->netdev->ll_addr[5] = eeprom[82];
+ bp->netdev->hw_addr[0] = eeprom[79];
+ bp->netdev->hw_addr[1] = eeprom[78];
+ bp->netdev->hw_addr[2] = eeprom[81];
+ bp->netdev->hw_addr[3] = eeprom[80];
+ bp->netdev->hw_addr[4] = eeprom[83];
+ bp->netdev->hw_addr[5] = eeprom[82];
/* Load PHY address */
bp->phy_addr = eeprom[90] & 0x1f;
@@ -935,9 +937,9 @@ static struct net_device_operations b44_operations = {
static struct pci_device_id b44_nics[] = {
- PCI_ROM(0x14e4, 0x4401, "BCM4401", "BCM4401"),
- PCI_ROM(0x14e4, 0x170c, "BCM4401-B0", "BCM4401-B0"),
- PCI_ROM(0x14e4, 0x4402, "BCM4401-B1", "BCM4401-B1"),
+ PCI_ROM(0x14e4, 0x4401, "BCM4401", "BCM4401", 0),
+ PCI_ROM(0x14e4, 0x170c, "BCM4401-B0", "BCM4401-B0", 0),
+ PCI_ROM(0x14e4, 0x4402, "BCM4401-B1", "BCM4401-B1", 0),
};