Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 144596
b: refs/heads/master
c: 379b026
h: refs/heads/master
v: v3
  • Loading branch information
Lubomir Rintel authored and David S. Miller committed May 2, 2009
1 parent e444a13 commit b4357c3
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 902e5ea15f8471a3213a37b11b98196f3406aeaf
refs/heads/master: 379b026ecc20c4657d37e40ead789f7f28f1a1c1
7 changes: 3 additions & 4 deletions trunk/drivers/net/ne2k-pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit b4357c3

Please sign in to comment.