From 6e141a0c35550aa3322ffc883bb8ebf007594e0a Mon Sep 17 00:00:00 2001
From: Michael Chan <mchan@broadcom.com>
Date: Mon, 27 Mar 2006 23:20:14 -0800
Subject: [PATCH] --- yaml --- r: 24671 b: refs/heads/master c:
 f475f163f128a0d9c92dfa90bcb5953fd8f9766f h: refs/heads/master i:   24669:
 76b2070945232323eed7a8405d6385c9d7fdf98e   24667:
 af435a78b901d3b37c545931a7c26b6859680a7b   24663:
 069521fa60df03538a4d475e0fbc38980d7d94af   24655:
 37041c06e7839ff7d0773821a3ee2d554068b098   24639:
 73d51d3b84484307c554a91f6e1d3eded897dc09 v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/net/tg3.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index fe2bc812600b..52d2aa67ca6a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 100c4673307f5806788791b9b886877c806afd96
+refs/heads/master: f475f163f128a0d9c92dfa90bcb5953fd8f9766f
diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c
index c504ff29d44c..b6a6051db77a 100644
--- a/trunk/drivers/net/tg3.c
+++ b/trunk/drivers/net/tg3.c
@@ -6468,6 +6468,9 @@ static void tg3_timer(unsigned long __opaque)
 {
 	struct tg3 *tp = (struct tg3 *) __opaque;
 
+	if (tp->irq_sync)
+		goto restart_timer;
+
 	spin_lock(&tp->lock);
 
 	if (!(tp->tg3_flags & TG3_FLAG_TAGGED_STATUS)) {
@@ -6558,6 +6561,7 @@ static void tg3_timer(unsigned long __opaque)
 
 	spin_unlock(&tp->lock);
 
+restart_timer:
 	tp->timer.expires = jiffies + tp->timer_offset;
 	add_timer(&tp->timer);
 }