Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=19abe86d60eeb34c5deeb3ab2d14229fa9f59157
Commit:     19abe86d60eeb34c5deeb3ab2d14229fa9f59157
Parent:     6e4ca80d27374048c43651f87b4a9c6eb52667d1
Author:     Auke Kok <[EMAIL PROTECTED]>
AuthorDate: Tue Oct 30 11:21:50 2007 -0700
Committer:  Jeff Garzik <[EMAIL PROTECTED]>
CommitDate: Tue Oct 30 14:32:17 2007 -0400

    ixgb: fix TX hangs under heavy load
    
    A merge error occurred where we merged the wrong block here
    in version 1.0.120. The right condition for frags is slightly
    different then for the skb, so account for the difference properly
    and trim the TSO based size right.
    
    Originally part of a fix reported by IBM to fix TSO hangs on
    pSeries hardware.
    
    Signed-off-by: Jesse Brandeburg <[EMAIL PROTECTED]>
    Signed-off-by: Auke Kok <[EMAIL PROTECTED]>
    Cc: Andy Gospodarek <[EMAIL PROTECTED]>
    Signed-off-by: Jeff Garzik <[EMAIL PROTECTED]>
---
 drivers/net/ixgb/ixgb_main.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c
index e564335..3021234 100644
--- a/drivers/net/ixgb/ixgb_main.c
+++ b/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;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to