diff options
| author | Florian Fainelli <florian.fainelli@telecomint.eu> | 2008-07-13 14:32:45 +0200 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2008-07-23 01:59:22 +0200 |
| commit | 129cf9a7028fc50b226b8021bc0b76fb38efa81d (patch) | |
| tree | 0ae6da9a3bedfbfa7838ca3fce42841c18af76dd | |
| parent | mv643xx_eth: fix NETPOLL build (diff) | |
| download | linux-129cf9a7028fc50b226b8021bc0b76fb38efa81d.tar.xz linux-129cf9a7028fc50b226b8021bc0b76fb38efa81d.zip | |
r6040: call napi_disable when puting down the interface and set lp->dev accordingly.
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>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/r6040.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/r6040.c b/drivers/net/r6040.c index 4f2ebb2e71be..5eb057d37200 100644 --- a/drivers/net/r6040.c +++ b/drivers/net/r6040.c @@ -485,6 +485,7 @@ static int r6040_close(struct net_device *dev) del_timer_sync(&lp->timer); spin_lock_irq(&lp->lock); + napi_disable(&lp->napi); netif_stop_queue(dev); r6040_down(dev); 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); lp = netdev_priv(dev); - lp->pdev = pdev; - lp->dev = dev; if (pci_request_regions(pdev, DRV_NAME)) { 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 */ lp->pdev = pdev; + lp->dev = dev; /* Init RDC private data */ lp->mcr0 = 0x1002; |