From 2e66f7d530414aa1d8dfed3189d203861c4019eb Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Sun, 13 Jul 2008 14:32:45 +0200 Subject: [PATCH] --- yaml --- r: 104945 b: refs/heads/master c: 129cf9a7028fc50b226b8021bc0b76fb38efa81d h: refs/heads/master i: 104943: 53d6c240664963ea4e1fc35e02933ac3499a3c27 v: v3 --- [refs] | 2 +- trunk/drivers/net/r6040.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index bc2b15c16a6c..382e6ee79648 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f2ca60f2067958e45f949e74abd580715c6c4b33 +refs/heads/master: 129cf9a7028fc50b226b8021bc0b76fb38efa81d diff --git a/trunk/drivers/net/r6040.c b/trunk/drivers/net/r6040.c index 4f2ebb2e71be..5eb057d37200 100644 --- a/trunk/drivers/net/r6040.c +++ b/trunk/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;