diff options
| author | Len Brown <len.brown@intel.com> | 2006-06-19 18:01:24 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-06-19 18:01:24 -0400 |
| commit | ae6c859b7dcd708efadf1c76279c33db213e3506 (patch) | |
| tree | c18c2e94537d5e3d4fde5bf52800333b7c237048 /drivers/net/sky2.c | |
| parent | 5b4b7a236e7787f16af4e15a6253d46d8e794be6 (diff) | |
| parent | 427abfa28afedffadfca9dd8b067eb6d36bac53f (diff) | |
| download | kernel-crypto-ae6c859b7dcd708efadf1c76279c33db213e3506.tar.gz kernel-crypto-ae6c859b7dcd708efadf1c76279c33db213e3506.tar.xz kernel-crypto-ae6c859b7dcd708efadf1c76279c33db213e3506.zip | |
merge linus into release branch
Diffstat (limited to 'drivers/net/sky2.c')
| -rw-r--r-- | drivers/net/sky2.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index 97fe95666f3..fba1e4d4d83 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c @@ -2255,8 +2255,10 @@ static irqreturn_t sky2_intr(int irq, void *dev_id, struct pt_regs *regs) static void sky2_netpoll(struct net_device *dev) { struct sky2_port *sky2 = netdev_priv(dev); + struct net_device *dev0 = sky2->hw->dev[0]; - sky2_intr(sky2->hw->pdev->irq, sky2->hw, NULL); + if (netif_running(dev) && __netif_rx_schedule_prep(dev0)) + __netif_rx_schedule(dev0); } #endif @@ -3446,6 +3448,7 @@ static int sky2_suspend(struct pci_dev *pdev, pm_message_t state) sky2_down(dev); netif_device_detach(dev); + netif_poll_disable(dev); } } @@ -3474,6 +3477,8 @@ static int sky2_resume(struct pci_dev *pdev) struct net_device *dev = hw->dev[i]; if (dev && netif_running(dev)) { netif_device_attach(dev); + netif_poll_enable(dev); + err = sky2_up(dev); if (err) { printk(KERN_ERR PFX "%s: could not up: %d\n", |