diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-10-05 01:18:40 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-10-05 01:18:40 +0000 |
| commit | 012bb3e61e5eced6c610f9e036372bf0c8def2d1 (patch) | |
| tree | 87efc733f9b164e8c85c0336f92c8fb7eff6d183 /drivers/net/ne2k-pci.c | |
| parent | 625a1589d3d6464b5d90b8a0918789e3afffd220 (diff) | |
Merge with Linux 2.4.0-test9. Please check DECstation, I had a number
of rejects to fixup while integrating Linus patches. I also found
that this kernel will only boot SMP on Origin; the UP kernel freeze
soon after bootup with SCSI timeout messages. I commit this anyway
since I found that the last CVS versions had the same problem.
Diffstat (limited to 'drivers/net/ne2k-pci.c')
| -rw-r--r-- | drivers/net/ne2k-pci.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/net/ne2k-pci.c b/drivers/net/ne2k-pci.c index 6ce703927..f43082c7f 100644 --- a/drivers/net/ne2k-pci.c +++ b/drivers/net/ne2k-pci.c @@ -286,7 +286,7 @@ static int __devinit ne2k_pci_init_one (struct pci_dev *pdev, /* Set up the rest of the parameters. */ dev->irq = irq; dev->base_addr = ioaddr; - pdev->driver_data = dev; + pci_set_drvdata(pdev, dev); /* Allocate dev->priv and fill in 8390 specific dev fields. */ if (ethdev_init(dev)) { @@ -535,16 +535,17 @@ ne2k_pci_block_output(struct net_device *dev, int count, static void __devexit ne2k_pci_remove_one (struct pci_dev *pdev) { - struct net_device *dev = pdev->driver_data; + struct net_device *dev = pci_get_drvdata(pdev); if (!dev) { printk (KERN_ERR "bug! ne2k_pci_remove_one called w/o net_device\n"); return; } - unregister_netdev (dev); - release_region (dev->base_addr, NE_IO_EXTENT); - kfree (dev); + unregister_netdev(dev); + release_region(dev->base_addr, NE_IO_EXTENT); + kfree(dev); + pci_set_drvdata(pdev, NULL); } |