From 3fe056365a600ae38919b90ceca23b1a137cc6a0 Mon Sep 17 00:00:00 2001
From: Michael Chan <mchan@broadcom.com>
Date: Mon, 20 Mar 2006 17:47:44 -0800
Subject: [PATCH] --- yaml --- r: 22151 b: refs/heads/master c:
 4e3a7aaa28db952392814f889dfbd25672266d29 h: refs/heads/master i:   22149:
 68d309bba25943b1c2f73e233aa4afbd935f9ed4   22147:
 8be8507393817f2109a136ec9f08da8d6db86704   22143:
 6f309b1d4e7fbb5ee72c876cb1319ea8a2618373 v: v3

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

diff --git a/[refs] b/[refs]
index 38a6b5591d8d..ec2625d7845c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d4d2c558fd3e1f5e386b153f194aa8f0be496c77
+refs/heads/master: 4e3a7aaa28db952392814f889dfbd25672266d29
diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c
index b0de6b2754cc..7deebd74223e 100644
--- a/trunk/drivers/net/tg3.c
+++ b/trunk/drivers/net/tg3.c
@@ -10881,11 +10881,12 @@ static int __devinit tg3_init_one(struct pci_dev *pdev,
 		tp->tg3_flags2 |= TG3_FLG2_TSO_CAPABLE;
 	}
 
-	/* TSO is off by default, user can enable using ethtool.  */
-#if 0
-	if (tp->tg3_flags2 & TG3_FLG2_TSO_CAPABLE)
+	/* TSO is on by default on chips that support hardware TSO.
+	 * Firmware TSO on older chips gives lower performance, so it
+	 * is off by default, but can be enabled using ethtool.
+	 */
+	if (tp->tg3_flags2 & TG3_FLG2_HW_TSO)
 		dev->features |= NETIF_F_TSO;
-#endif
 
 #endif