Commit 5c0d6b34 authored Oct 14, 2007 by Stephen Hemminger Committed by Linus Torvalds Oct 14, 2007

sky2: reboot fix



The call to napi_disable() in the PCI shutdown handler is problematic,
and is aggravated by the new NAPI.
Also, make sure watchdog timer doesn't go off.

Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 4fa43501

drivers/net/sky2.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -4396,7 +4396,7 @@ static void sky2_shutdown(struct pci_dev *pdev)
	if (!hw)		if (!hw)
	return;		return;

	napi_disable(&hw->napi);		del_timer_sync(&hw->watchdog_timer);

	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];