From 9e6cf21829ee845ddec206c83919913c8830cd04 Mon Sep 17 00:00:00 2001
From: Jesse Brandeburg <jesse.brandeburg@intel.com>
Date: Tue, 24 Oct 2006 14:46:04 -0700
Subject: [PATCH] --- yaml --- r: 40361 b: refs/heads/master c:
 032fe6e9e253ebb37a0df0893844674dea9210fd h: refs/heads/master i:   40359:
 d13c5fb7cdd68513d0a081ad1d701e4ea49e3429 v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/net/e1000/e1000_main.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 7dd0aa507e1b..a2185cb1f713 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e64d7d02090e475cfd7efbc830146d0c6dd579bc
+refs/heads/master: 032fe6e9e253ebb37a0df0893844674dea9210fd
diff --git a/trunk/drivers/net/e1000/e1000_main.c b/trunk/drivers/net/e1000/e1000_main.c
index 7362e1240178..e75909ee6d85 100644
--- a/trunk/drivers/net/e1000/e1000_main.c
+++ b/trunk/drivers/net/e1000/e1000_main.c
@@ -2992,6 +2992,11 @@ e1000_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
 		return NETDEV_TX_OK;
 	}
 
+	/* 82571 and newer doesn't need the workaround that limited descriptor
+	 * length to 4kB */
+	if (adapter->hw.mac_type >= e1000_82571)
+		max_per_txd = 8192;
+
 #ifdef NETIF_F_TSO
 	mss = skb_shinfo(skb)->gso_size;
 	/* The controller does a simple calculation to