diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-16 20:24:53 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-16 20:24:53 -0400 |
| commit | 492b057c426e4aa747484958e18e9da29003985d (patch) | |
| tree | 34e08c24618688d8bcc190523028b5f94cce0c0b /drivers/net/ne2k-pci.c | |
| parent | 313485175da221c388f6a8ecf4c30062ba9bea17 (diff) | |
| parent | 300df7dc89cc276377fc020704e34875d5c473b6 (diff) | |
Merge commit 'origin/master' into next
Diffstat (limited to 'drivers/net/ne2k-pci.c')
| -rw-r--r-- | drivers/net/ne2k-pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ne2k-pci.c b/drivers/net/ne2k-pci.c index 7d83896b8c26..3fcebb70151c 100644 --- a/drivers/net/ne2k-pci.c +++ b/drivers/net/ne2k-pci.c | |||
| @@ -374,7 +374,7 @@ static int __devinit ne2k_pci_init_one (struct pci_dev *pdev, | |||
| 374 | dev->ethtool_ops = &ne2k_pci_ethtool_ops; | 374 | dev->ethtool_ops = &ne2k_pci_ethtool_ops; |
| 375 | NS8390_init(dev, 0); | 375 | NS8390_init(dev, 0); |
| 376 | 376 | ||
| 377 | memcpy(dev->dev_addr, SA_prom, 6); | 377 | memcpy(dev->dev_addr, SA_prom, dev->addr_len); |
| 378 | memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len); | 378 | memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len); |
| 379 | 379 | ||
| 380 | i = register_netdev(dev); | 380 | i = register_netdev(dev); |