From owner-p4-projects@FreeBSD.ORG  Mon Feb 16 16:13:02 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id BA7891065670; Mon, 16 Feb 2009 16:13:01 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 762541065677
	for <perforce@freebsd.org>; Mon, 16 Feb 2009 16:13:01 +0000 (UTC)
	(envelope-from andre@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 650718FC1C
	for <perforce@freebsd.org>; Mon, 16 Feb 2009 16:13:01 +0000 (UTC)
	(envelope-from andre@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n1GGD1GY055306
	for <perforce@freebsd.org>; Mon, 16 Feb 2009 16:13:01 GMT
	(envelope-from andre@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n1GGD1SG055304
	for perforce@freebsd.org; Mon, 16 Feb 2009 16:13:01 GMT
	(envelope-from andre@freebsd.org)
Date: Mon, 16 Feb 2009 16:13:01 GMT
Message-Id: <200902161613.n1GGD1SG055304@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	andre@freebsd.org using -f
From: Andre Oppermann <andre@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 157797 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 16 Feb 2009 16:13:03 -0000

http://perforce.freebsd.org/chv.cgi?CH=157797

Change 157797 by andre@andre_flirtbox on 2009/02/16 16:12:36

	Refine the segment size calculation in the TSO case.

Affected files ...

.. //depot/projects/tcp_new/netinet/tcp_output.c#3 edit

Differences ...

==== //depot/projects/tcp_new/netinet/tcp_output.c#3 (text+ko) ====

@@ -722,9 +722,11 @@
 	if (len + optlen + ipoptlen > tp->t_maxopd) {
 		flags &= ~TH_FIN;
 		if (tso) {
-			if (len > TCP_MAXWIN - hdrlen - optlen) {
-				len = TCP_MAXWIN - hdrlen - optlen;
-				len = len - (len % (tp->t_maxopd - optlen));
+			int hdrs =  max_linkhdr + hdrlen + optlen + ipoptlen;
+
+			if (len > TCP_MAXWIN - hdrs) {
+				len = TCP_MAXWIN - hdrs;
+				len -= len % (tp->t_maxopd - optlen);
 				sendalot = 1;
 			} else if (tp->t_flags & TF_NEEDFIN)
 				sendalot = 1;