Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=5c0d6b34d6ee11ff979cbdac9a59b47a74cb9f43
Commit:     5c0d6b34d6ee11ff979cbdac9a59b47a74cb9f43
Parent:     4fa435018d740cb83d74c92306aa1f796da91ddd
Author:     Stephen Hemminger <[EMAIL PROTECTED]>
AuthorDate: Sun Oct 14 13:25:22 2007 -0700
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Sun Oct 14 16:46:44 2007 -0700

    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 <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
---
 drivers/net/sky2.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 68f728f..7967240 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -4396,7 +4396,7 @@ static void sky2_shutdown(struct pci_dev *pdev)
        if (!hw)
                return;
 
-       napi_disable(&hw->napi);
+       del_timer_sync(&hw->watchdog_timer);
 
        for (i = 0; i < hw->ports; i++) {
                struct net_device *dev = hw->dev[i];
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to