From c058b43d90ad5fb279bf7e4e0af64aeb6cc71d43 Mon Sep 17 00:00:00 2001
From: Matt Carlson <mcarlson@broadcom.com>
Date: Sat, 5 Jun 2010 17:24:31 +0000
Subject: [PATCH] --- yaml --- r: 202677 b: refs/heads/master c:
 b1d0521059789a138d19c4f940d6eca7d620a6eb h: refs/heads/master i:   202675:
 7c77bd734ae24142637b398fb92b688625a8793e v: v3

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

diff --git a/[refs] b/[refs]
index 0918696d4eda..891f91f81998 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f92d9dc1504a964acfe07e8036fa30dcef22d343
+refs/heads/master: b1d0521059789a138d19c4f940d6eca7d620a6eb
diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c
index bd331174550b..057e8ebc1b25 100644
--- a/trunk/drivers/net/tg3.c
+++ b/trunk/drivers/net/tg3.c
@@ -8214,6 +8214,9 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)
 	}
 
 	tp->tx_mode = TX_MODE_ENABLE;
+	if ((tp->tg3_flags3 & TG3_FLG3_5755_PLUS) ||
+	    GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5906)
+		tp->tx_mode |= TX_MODE_MBUF_LOCKUP_FIX;
 	tw32_f(MAC_TX_MODE, tp->tx_mode);
 	udelay(100);
 
diff --git a/trunk/drivers/net/tg3.h b/trunk/drivers/net/tg3.h
index 84ea0dca7d29..c245e809d428 100644
--- a/trunk/drivers/net/tg3.h
+++ b/trunk/drivers/net/tg3.h
@@ -469,6 +469,7 @@
 #define  TX_MODE_FLOW_CTRL_ENABLE	 0x00000010
 #define  TX_MODE_BIG_BCKOFF_ENABLE	 0x00000020
 #define  TX_MODE_LONG_PAUSE_ENABLE	 0x00000040
+#define  TX_MODE_MBUF_LOCKUP_FIX	 0x00000100
 #define MAC_TX_STATUS			0x00000460
 #define  TX_STATUS_XOFFED		 0x00000001
 #define  TX_STATUS_SENT_XOFF		 0x00000002