---

yaml --- r: 24671 b: refs/heads/master c: f475f16 h: refs/heads/master i: 24669: 76b2070 24667: af435a7 24663: 069521f 24655: 37041c0 24639: 73d51d3 v: v3
git-mirror · Mar 29, 2006 · 6e141a0 · 6e141a0
1 parent ce7bdf9
commit 6e141a0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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);
 }