From owner-svn-src-stable-7@FreeBSD.ORG  Mon Jan  9 19:31:36 2012
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 47738106566B;
	Mon,  9 Jan 2012 19:31:36 +0000 (UTC)
	(envelope-from yongari@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 35FD68FC1C;
	Mon,  9 Jan 2012 19:31:36 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q09JVa81055067;
	Mon, 9 Jan 2012 19:31:36 GMT (envelope-from yongari@svn.freebsd.org)
Received: (from yongari@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q09JVaBs055065;
	Mon, 9 Jan 2012 19:31:36 GMT (envelope-from yongari@svn.freebsd.org)
Message-Id: <201201091931.q09JVaBs055065@svn.freebsd.org>
From: Pyun YongHyeon <yongari@FreeBSD.org>
Date: Mon, 9 Jan 2012 19:31:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r229872 - stable/7/sys/dev/fxp
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Jan 2012 19:31:36 -0000

Author: yongari
Date: Mon Jan  9 19:31:35 2012
New Revision: 229872
URL: http://svn.freebsd.org/changeset/base/229872

Log:
  MFC r228716:
    TCP header size is represented by number of 32bits words.
    Fix the TCP header size calculation such that makes TSO engine
    cache all header(ethernet/IP/TCP) bytes to its internal buffer.
    While here, remove extra pull up for TCP payload.  Unlike some
    em(4) controllers, fxp(4) does not require such work around for
    TSO.
    The two limitations are ethernet/IP/TCP header size should be less
    than or equal to the size of controller's internal buffer(80 bytes)
    and these header information should be found in the first fragment
    of a TSO frame.

Modified:
  stable/7/sys/dev/fxp/if_fxp.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/dev/fxp/if_fxp.c
==============================================================================
--- stable/7/sys/dev/fxp/if_fxp.c	Mon Jan  9 19:30:23 2012	(r229871)
+++ stable/7/sys/dev/fxp/if_fxp.c	Mon Jan  9 19:31:35 2012	(r229872)
@@ -1455,7 +1455,7 @@ fxp_encap(struct fxp_softc *sc, struct m
 			return (ENOBUFS);
 		}
 		tcp = (struct tcphdr *)(mtod(m, char *) + poff);
-		m = m_pullup(m, poff + sizeof(struct tcphdr) + tcp->th_off);
+		m = m_pullup(m, poff + (tcp->th_off << 2));
 		if (m == NULL) {
 			*m_head = NULL;
 			return (ENOBUFS);