Skip to contentSkip to conversation

sky2: fix suspend/resume races

PATCH New Stephen Hemminger 1 participant 1 message Apr 2, 2008

Subsystems (2)
Networking Network drivers
lore
Share & tools
lore

Stephen Hemminger

author
#0 lore raw

PATCH 1/1 sky2: fix suspend/resume races

There are a couple of possible races on suspend/resume reported by Dell. 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.

Note: there is no need to explicitly restart the watchdog timer since it gets restarted by link up on resume.

Signed-off-by Stephen Hemminger <[email protected]>
drivers/net/sky2.c +6 -0
@@ -4329,10 +4329,14 @@ static int sky2_suspend(struct pci_dev *
 	if (!hw)
 		return 0;
 
+	del_timer_sync(&hw->watchdog_timer);
+	cancel_work_sync(&hw->restart_work);
+
 	for (i = 0; i < hw->ports; i++) {
 		struct net_device *dev = hw->dev[i];
 		struct sky2_port *sky2 = netdev_priv(dev);
 
+		netif_device_detach(dev);
 		if (netif_running(dev))
 			sky2_down(dev);
 

@@ -4383,6 +4387,8 @@ static int sky2_resume(struct pci_dev *p
 
 	for (i = 0; i < hw->ports; i++) {
 		struct net_device *dev = hw->dev[i];
+
+		netif_device_attach(dev);
 		if (netif_running(dev)) {
 			err = sky2_up(dev);
 			if (err) {