OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] sky2: NAPI suspend/resume of dual port cards 

The changes to handle suspend/resume didn't handle the case where
a dual port card has the first port down, but the second is running.
In this driver, all NAPI polling is done on the primary port.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
Stephen Hemminger 2006-07-12 15:23:46 -07:00 committed by Jeff Garzik
parent 59139528c8
commit 6a5706b99c
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/net/sky2.c
View File

@ -3437,17 +3437,14 @@ static int sky2_suspend(struct pci_dev *pdev, pm_message_t state)
return -EINVAL;
del_timer_sync(&hw->idle_timer);
netif_poll_disable(hw->dev[0]);
for (i = 0; i < hw->ports; i++) {
struct net_device *dev = hw->dev[i];
if (dev) {
if (!netif_running(dev))
continue;
if (netif_running(dev)) {
sky2_down(dev);
netif_device_detach(dev);
netif_poll_disable(dev);
}
}
@ -3474,9 +3471,8 @@ static int sky2_resume(struct pci_dev *pdev)
for (i = 0; i < hw->ports; i++) {
struct net_device *dev = hw->dev[i];
if (dev && netif_running(dev)) {
if (netif_running(dev)) {
netif_device_attach(dev);
netif_poll_enable(dev);
err = sky2_up(dev);
if (err) {
@ -3488,6 +3484,7 @@ static int sky2_resume(struct pci_dev *pdev)
}
}
netif_poll_enable(hw->dev[0]);
sky2_idle_start(hw);
out:
return err;