AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

r6040: call napi_disable when puting down the interface and set lp->dev accordingly.

Browse Source 
We did not call napi_disabled when putting down the interface
which should be done. Finally initialize lp->dev when everything
is set.

Signed-off-by: Florian Fainelli <florian.fainelli@telecomint.eu>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
This commit is contained in:
Florian Fainelli 2008-07-13 14:32:45 +02:00 committed by Jeff Garzik
parent f2ca60f206
commit 129cf9a702
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/r6040.c
View File

@ -485,6 +485,7 @@ static int r6040_close(struct net_device *dev)
del_timer_sync(&lp->timer); del_timer_sync(&lp->timer);
spin_lock_irq(&lp->lock); spin_lock_irq(&lp->lock);
napi_disable(&lp->napi);
netif_stop_queue(dev); netif_stop_queue(dev);
r6040_down(dev); r6040_down(dev);
spin_unlock_irq(&lp->lock); spin_unlock_irq(&lp->lock);
@ -1080,8 +1081,6 @@ static int __devinit r6040_init_one(struct pci_dev *pdev,
} }
SET_NETDEV_DEV(dev, &pdev->dev); SET_NETDEV_DEV(dev, &pdev->dev);
lp = netdev_priv(dev); lp = netdev_priv(dev);
lp->pdev = pdev;
lp->dev = dev;
if (pci_request_regions(pdev, DRV_NAME)) { if (pci_request_regions(pdev, DRV_NAME)) {
printk(KERN_ERR DRV_NAME ": Failed to request PCI regions\n"); printk(KERN_ERR DRV_NAME ": Failed to request PCI regions\n");
@ -1113,6 +1112,7 @@ static int __devinit r6040_init_one(struct pci_dev *pdev,
/* Link new device into r6040_root_dev */ /* Link new device into r6040_root_dev */
lp->pdev = pdev; lp->pdev = pdev;
lp->dev = dev;
/* Init RDC private data */ /* Init RDC private data */
lp->mcr0 = 0x1002; lp->mcr0 = 0x1002;