aboutsummaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorMichael Chan2006-03-20 17:47:44 -0800
committerDavid S. Miller2006-03-20 17:47:44 -0800
commit4e3a7aaa28db952392814f889dfbd25672266d29 (patch)
treea82c9151a64951e8812b269dbb00b00b2f759ea3 /drivers/net
parentd4d2c558fd3e1f5e386b153f194aa8f0be496c77 (diff)
[TG3]: Enable TSO by default
Enable TSO by default on newer chips that support TSO in hardware. Leave TSO off by default on older chips that do firmware TSO because performance is slightly lower. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/tg3.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index b0de6b2754cc..7deebd74223e 100644
--- a/drivers/net/tg3.c
+++ b/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