summaryrefslogtreecommitdiff
path: root/drivers/net/ne2k-pci.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-05-03 14:18:53 -0700
committerDavid S. Miller <davem@davemloft.net>2009-05-03 14:18:53 -0700
commit698960a081bfcc3e2e0f556342d86405346d2edc (patch)
treee20e99c6720437b88690e355d24c597a989e9f15 /drivers/net/ne2k-pci.c
parentd252a5e7b73026b3ba3c49940724292099e634f0 (diff)
parent379b026ecc20c4657d37e40ead789f7f28f1a1c1 (diff)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/ne2k-pci.c')
-rw-r--r--drivers/net/ne2k-pci.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/ne2k-pci.c b/drivers/net/ne2k-pci.c
index eb66f658f9d1..7d83896b8c26 100644
--- a/drivers/net/ne2k-pci.c
+++ b/drivers/net/ne2k-pci.c
@@ -374,18 +374,17 @@ static int __devinit ne2k_pci_init_one (struct pci_dev *pdev,
dev->ethtool_ops = &ne2k_pci_ethtool_ops;
NS8390_init(dev, 0);
+ memcpy(dev->dev_addr, SA_prom, 6);
+ memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
+
i = register_netdev(dev);
if (i)
goto err_out_free_netdev;
- for(i = 0; i < 6; i++)
- dev->dev_addr[i] = SA_prom[i];
printk("%s: %s found at %#lx, IRQ %d, %pM.\n",
dev->name, pci_clone_list[chip_idx].name, ioaddr, dev->irq,
dev->dev_addr);
- memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
-
return 0;
err_out_free_netdev: