]> err.no Git - linux-2.6/commit
ixgb: fix TX hangs under heavy load
authorAuke Kok <auke-jan.h.kok@intel.com>
Tue, 30 Oct 2007 18:21:50 +0000 (11:21 -0700)
committerJeff Garzik <jeff@garzik.org>
Tue, 30 Oct 2007 18:32:17 +0000 (14:32 -0400)
commit19abe86d60eeb34c5deeb3ab2d14229fa9f59157
tree3d201cb4f21a7fc898e2d227a9d903ff9979cdad
parent6e4ca80d27374048c43651f87b4a9c6eb52667d1
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 <jesse.brandeburg@intel.com>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
Cc: Andy Gospodarek <andy@greyhouse.net>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
drivers/net/ixgb/ixgb_main.c