From 5b814c9435c92e01152e105444bbbdda6790b95b Mon Sep 17 00:00:00 2001
From: Matt Carlson <mcarlson@broadcom.com>
Date: Wed, 20 Jan 2010 16:58:08 +0000
Subject: [PATCH] --- yaml --- r: 183705 b: refs/heads/master c:
 c2353a3214ff5813c4b719b3cdacbe939b1c63a0 h: refs/heads/master i:   183703:
 5cad756f309f615dfbf53449f32f778bdaf11b92 v: v3

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

diff --git a/[refs] b/[refs]
index 8882c89f6faa..eac2e7e97901 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5fd68fbdaf75505a2400826c7f314a1f3121a5f7
+refs/heads/master: c2353a3214ff5813c4b719b3cdacbe939b1c63a0
diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c
index 72d1e18a152c..dffa51a4aafb 100644
--- a/trunk/drivers/net/tg3.c
+++ b/trunk/drivers/net/tg3.c
@@ -7440,10 +7440,13 @@ static void tg3_rings_reset(struct tg3 *tp)
 		for (i = 1; i < TG3_IRQ_MAX_VECS; i++) {
 			tp->napi[i].tx_prod = 0;
 			tp->napi[i].tx_cons = 0;
-			tw32_mailbox(tp->napi[i].prodmbox, 0);
+			if (tp->tg3_flags3 & TG3_FLG3_ENABLE_TSS)
+				tw32_mailbox(tp->napi[i].prodmbox, 0);
 			tw32_rx_mbox(tp->napi[i].consmbox, 0);
 			tw32_mailbox_f(tp->napi[i].int_mbox, 1);
 		}
+		if (!(tp->tg3_flags3 & TG3_FLG3_ENABLE_TSS))
+			tw32_mailbox(tp->napi[0].prodmbox, 0);
 	} else {
 		tp->napi[0].tx_prod = 0;
 		tp->napi[0].tx_cons = 0;