From owner-p4-projects@FreeBSD.ORG  Wed Jan 23 19:57:25 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E967916A475; Wed, 23 Jan 2008 19:57:24 +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 AC2A516A46C
	for <perforce@freebsd.org>; Wed, 23 Jan 2008 19:57:24 +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 A69C413C4CC
	for <perforce@freebsd.org>; Wed, 23 Jan 2008 19:57:24 +0000 (UTC)
	(envelope-from andre@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0NJvO26080515
	for <perforce@freebsd.org>; Wed, 23 Jan 2008 19:57:24 GMT
	(envelope-from andre@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0NJvOdT080512
	for perforce@freebsd.org; Wed, 23 Jan 2008 19:57:24 GMT
	(envelope-from andre@freebsd.org)
Date: Wed, 23 Jan 2008 19:57:24 GMT
Message-Id: <200801231957.m0NJvOdT080512@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 133938 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: Wed, 23 Jan 2008 19:57:25 -0000

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

Change 133938 by andre@andre_flirtbox on 2008/01/23 19:56:30

	Account for the cluster and its mbuf, not only the cluster.

Affected files ...

.. //depot/projects/tcp_reass/netinet/tcp_reass.c#13 edit

Differences ...

==== //depot/projects/tcp_reass/netinet/tcp_reass.c#13 (text+ko) ====

@@ -253,7 +253,8 @@
 
 	/* NB: m_adj(m, -i) may free mbufs at the tail of a chain. */
 	for (mcnt = 0, n = m; n; n = n->m_next)
-		mcnt += (n->m_flags & M_EXT) ? n->m_ext.ext_size : MSIZE;
+		mcnt += (n->m_flags & M_EXT) ?
+		    n->m_ext.ext_size + MSIZE : MSIZE;
 
 	/* Check if this segment attaches to the end. */
 	tqe = TAILQ_LAST(&tp->t_trq, trq_head);
@@ -297,7 +298,7 @@
 				/* Update accounting. */
 				for (mcnt = 0, n = m; n; n = n->m_next)
 					mcnt += (n->m_flags & M_EXT) ?
-					    n->m_ext.ext_size : MSIZE;
+					    n->m_ext.ext_size + MSIZE : MSIZE;
 			}
 			tqe->trq_len += *tlenp;
 			tqe->trq_mcnt += mcnt;
@@ -373,7 +374,7 @@
 				/* Update accounting. */
 				for (mcnt = 0, n = m; n; n = n->m_next)
 					mcnt += (n->m_flags & M_EXT) ?
-					    n->m_ext.ext_size : MSIZE;
+					    n->m_ext.ext_size + MSIZE : MSIZE;
 			}
 			tqe->trq_len += *tlenp;
 			tqe->trq_mcnt += mcnt;