Commit 063a0b38 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by Linus Torvalds

sky2: fix suspend/resume races

There are a couple of possible races on suspend/resume.
First the driver needs to block new packets from being queued for Tx.
The other less likely problem is the watchdog timer going off
during resume.
Signed-off-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 49115b7c
...@@ -4329,10 +4329,14 @@ static int sky2_suspend(struct pci_dev *pdev, pm_message_t state) ...@@ -4329,10 +4329,14 @@ static int sky2_suspend(struct pci_dev *pdev, pm_message_t state)
if (!hw) if (!hw)
return 0; return 0;
del_timer_sync(&hw->watchdog_timer);
cancel_work_sync(&hw->restart_work);
for (i = 0; i < hw->ports; i++) { for (i = 0; i < hw->ports; i++) {
struct net_device *dev = hw->dev[i]; struct net_device *dev = hw->dev[i];
struct sky2_port *sky2 = netdev_priv(dev); struct sky2_port *sky2 = netdev_priv(dev);
netif_device_detach(dev);
if (netif_running(dev)) if (netif_running(dev))
sky2_down(dev); sky2_down(dev);
...@@ -4383,6 +4387,8 @@ static int sky2_resume(struct pci_dev *pdev) ...@@ -4383,6 +4387,8 @@ static int sky2_resume(struct pci_dev *pdev)
for (i = 0; i < hw->ports; i++) { for (i = 0; i < hw->ports; i++) {
struct net_device *dev = hw->dev[i]; struct net_device *dev = hw->dev[i];
netif_device_attach(dev);
if (netif_running(dev)) { if (netif_running(dev)) {
err = sky2_up(dev); err = sky2_up(dev);
if (err) { if (err) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment