From 81223c6264256eae97b853dbd22be4de03050716 Mon Sep 17 00:00:00 2001
From: Andy Gospodarek <andy@greyhouse.net>
Date: Thu, 19 Jun 2008 17:19:02 -0400
Subject: [PATCH] --- yaml --- r: 98542 b: refs/heads/master c:
 581abbc26a7adb693fb8b913f1be18d1c349c1ab h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 774f644d11cc..c3de71f4d646 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1923815d855e1daec931fc9f2221fb73ca708870
+refs/heads/master: 581abbc26a7adb693fb8b913f1be18d1c349c1ab
diff --git a/trunk/drivers/net/e1000/e1000_ethtool.c b/trunk/drivers/net/e1000/e1000_ethtool.c
index 701531e72e7b..a3f6a9c72ec8 100644
--- a/trunk/drivers/net/e1000/e1000_ethtool.c
+++ b/trunk/drivers/net/e1000/e1000_ethtool.c
@@ -347,7 +347,7 @@ e1000_set_tso(struct net_device *netdev, u32 data)
 	else
 		netdev->features &= ~NETIF_F_TSO;
 
-	if (data)
+	if (data && (adapter->hw.mac_type > e1000_82547_rev_2))
 		netdev->features |= NETIF_F_TSO6;
 	else
 		netdev->features &= ~NETIF_F_TSO6;