aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/forcedeth.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index d6eefdb71c17..6e042ecf6965 100644
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@ -2065,6 +2065,7 @@ static struct ethtool_ops ops = {
2065 .get_regs_len = nv_get_regs_len, 2065 .get_regs_len = nv_get_regs_len,
2066 .get_regs = nv_get_regs, 2066 .get_regs = nv_get_regs,
2067 .nway_reset = nv_nway_reset, 2067 .nway_reset = nv_nway_reset,
2068 .get_perm_addr = ethtool_op_get_perm_addr,
2068}; 2069};
2069 2070
2070static int nv_open(struct net_device *dev) 2071static int nv_open(struct net_device *dev)
@@ -2377,8 +2378,9 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i
2377 dev->dev_addr[3] = (np->orig_mac[0] >> 16) & 0xff; 2378 dev->dev_addr[3] = (np->orig_mac[0] >> 16) & 0xff;
2378 dev->dev_addr[4] = (np->orig_mac[0] >> 8) & 0xff; 2379 dev->dev_addr[4] = (np->orig_mac[0] >> 8) & 0xff;
2379 dev->dev_addr[5] = (np->orig_mac[0] >> 0) & 0xff; 2380 dev->dev_addr[5] = (np->orig_mac[0] >> 0) & 0xff;
2381 memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
2380 2382
2381 if (!is_valid_ether_addr(dev->dev_addr)) { 2383 if (!is_valid_ether_addr(dev->perm_addr)) {
2382 /* 2384 /*
2383 * Bad mac address. At least one bios sets the mac address 2385 * Bad mac address. At least one bios sets the mac address
2384 * to 01:23:45:67:89:ab 2386 * to 01:23:45:67:89:ab