From: David S. Miller <davem@nuts.ninka.net>
Date: Tue, 21 Oct 2003 19:55:23 +0000 (-0700)
Subject: [TG3]: Disable/enable timer in suspend/resume.
X-Git-Tag: v2.6.0-test9~11^2~5
X-Git-Url: http://git.neil.brown.name/?a=commitdiff_plain;h=97bdefff2e787b2fef6594ded3cee7f39f479b88;p=history.git

[TG3]: Disable/enable timer in suspend/resume.
---

diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 3ebedccf00b3..92b59780aca9 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -7776,6 +7776,8 @@ static int tg3_suspend(struct pci_dev *pdev, u32 state)
 
 	tg3_netif_stop(tp);
 
+	del_timer_sync(&tp->timer);
+
 	spin_lock_irq(&tp->lock);
 	spin_lock(&tp->tx_lock);
 	tg3_disable_ints(tp);
@@ -7797,6 +7799,9 @@ static int tg3_suspend(struct pci_dev *pdev, u32 state)
 
 		tg3_init_hw(tp);
 
+		tp->timer.expires = jiffies + tp->timer_offset;
+		add_timer(&tp->timer);
+
 		spin_unlock(&tp->tx_lock);
 		spin_unlock_irq(&tp->lock);
 
@@ -7826,6 +7831,10 @@ static int tg3_resume(struct pci_dev *pdev)
 	spin_lock(&tp->tx_lock);
 
 	tg3_init_hw(tp);
+
+	tp->timer.expires = jiffies + tp->timer_offset;
+	add_timer(&tp->timer);
+
 	tg3_enable_ints(tp);
 
 	spin_unlock(&tp->tx_lock);