aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-06-18 01:22:42 -0400
committerJeff Garzik <jeff@garzik.org>2006-06-18 01:22:42 -0400
commit4b6ace7f02cddb8c363ad27bb1e5014c6791e34a (patch)
treedf99b49818371ee6dcdbfedaee66f457dafc3a68 /drivers/net
parentb5ed7639c9f502898af4109e778f5613dacbfd9c (diff)
parent427abfa28afedffadfca9dd8b067eb6d36bac53f (diff)
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/sky2.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 97fe95666f3b..fba1e4d4d83d 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)
2255static void sky2_netpoll(struct net_device *dev) 2255static void sky2_netpoll(struct net_device *dev)
2256{ 2256{
2257 struct sky2_port *sky2 = netdev_priv(dev); 2257 struct sky2_port *sky2 = netdev_priv(dev);
2258 struct net_device *dev0 = sky2->hw->dev[0];
2258 2259
2259 sky2_intr(sky2->hw->pdev->irq, sky2->hw, NULL); 2260 if (netif_running(dev) && __netif_rx_schedule_prep(dev0))
2261 __netif_rx_schedule(dev0);
2260} 2262}
2261#endif 2263#endif
2262 2264
@@ -3446,6 +3448,7 @@ static int sky2_suspend(struct pci_dev *pdev, pm_message_t state)
3446 3448
3447 sky2_down(dev); 3449 sky2_down(dev);
3448 netif_device_detach(dev); 3450 netif_device_detach(dev);
3451 netif_poll_disable(dev);
3449 } 3452 }
3450 } 3453 }
3451 3454
@@ -3474,6 +3477,8 @@ static int sky2_resume(struct pci_dev *pdev)
3474 struct net_device *dev = hw->dev[i]; 3477 struct net_device *dev = hw->dev[i];
3475 if (dev && netif_running(dev)) { 3478 if (dev && netif_running(dev)) {
3476 netif_device_attach(dev); 3479 netif_device_attach(dev);
3480 netif_poll_enable(dev);
3481
3477 err = sky2_up(dev); 3482 err = sky2_up(dev);
3478 if (err) { 3483 if (err) {
3479 printk(KERN_ERR PFX "%s: could not up: %d\n", 3484 printk(KERN_ERR PFX "%s: could not up: %d\n",