From 0e9c9659906779cefc4ecaab99df7eaa1f4d2885 Mon Sep 17 00:00:00 2001
From: Auke Kok <auke-jan.h.kok@intel.com>
Date: Tue, 30 Oct 2007 11:21:50 -0700
Subject: [PATCH] --- yaml --- r: 72903 b: refs/heads/master c:
 19abe86d60eeb34c5deeb3ab2d14229fa9f59157 h: refs/heads/master i:   72901:
 f9fe25c7afcb4d596c5008560797f83e5d34b73e   72899:
 a1a3218cf6856e5b8c1cb2add0d231d7c33bab7a   72895:
 dd86fe6e4f9afdff0b9f94ed2f181db33a2d44f7 v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/net/ixgb/ixgb_main.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 5d6277a6673a..476c5ffb19fc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6e4ca80d27374048c43651f87b4a9c6eb52667d1
+refs/heads/master: 19abe86d60eeb34c5deeb3ab2d14229fa9f59157
diff --git a/trunk/drivers/net/ixgb/ixgb_main.c b/trunk/drivers/net/ixgb/ixgb_main.c
index e564335b4b84..3021234b1e17 100644
--- a/trunk/drivers/net/ixgb/ixgb_main.c
+++ b/trunk/drivers/net/ixgb/ixgb_main.c
@@ -1321,8 +1321,8 @@ ixgb_tx_map(struct ixgb_adapter *adapter, struct sk_buff *skb,
 
 			/* Workaround for premature desc write-backs
 			 * in TSO mode.  Append 4-byte sentinel desc */
-			if (unlikely(mss && !nr_frags && size == len
-			             && size > 8))
+			if (unlikely(mss && (f == (nr_frags - 1))
+				     && size == len && size > 8))
 				size -= 4;
 
 			buffer_info->length = size;