From owner-p4-projects@FreeBSD.ORG  Tue Jan 15 00:03:46 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id BED5216A41A; Tue, 15 Jan 2008 00:03:46 +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 8376816A417
	for <perforce@freebsd.org>; Tue, 15 Jan 2008 00:03:46 +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 6A6C013C457
	for <perforce@freebsd.org>; Tue, 15 Jan 2008 00:03:46 +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 m0F03kvo079693
	for <perforce@freebsd.org>; Tue, 15 Jan 2008 00:03:46 GMT
	(envelope-from andre@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0F03k85079690
	for perforce@freebsd.org; Tue, 15 Jan 2008 00:03:46 GMT
	(envelope-from andre@freebsd.org)
Date: Tue, 15 Jan 2008 00:03:46 GMT
Message-Id: <200801150003.m0F03k85079690@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 133290 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: Tue, 15 Jan 2008 00:03:47 -0000

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

Change 133290 by andre@andre_flirtbox on 2008/01/15 00:03:16

	Fix mbuf accounting.

Affected files ...

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

Differences ...

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

@@ -142,7 +142,7 @@
 	struct trq *tqe, *tqen;
 	struct socket *so = tp->t_inpcb->inp_socket;
 	struct mbuf *n;
-	int i, flags = 0, mcnt = 0;
+	int i, flags = 0, mcnt;
 
 	INP_LOCK_ASSERT(tp->t_inpcb);
 
@@ -184,7 +184,7 @@
 	}
 
 	/* NB: m_adj(m, -i) may free mbufs at the tail of a chain. */
-	for (n = m; n; n = n->m_next)
+	for (mcnt = 0, n = m; n; n = n->m_next)
 		mcnt += (n->m_flags & M_EXT) ? n->m_ext.ext_size : MSIZE;
 
 	/* Get rid of packet header and mtags. */
@@ -220,7 +220,7 @@
 				tcpstat.tcps_rcvpartduppack++;
 				tcpstat.tcps_rcvpartdupbyte -= i;
 				/* Update accounting. */
-				for (n = m; n; n = n->m_next)
+				for (mcnt = 0, n = m; n; n = n->m_next)
 					mcnt += (n->m_flags & M_EXT) ?
 					    n->m_ext.ext_size : MSIZE;
 			}
@@ -307,7 +307,7 @@
 				tcpstat.tcps_rcvpartduppack++;
 				tcpstat.tcps_rcvpartdupbyte -= i;
 				/* Update accounting. */
-				for (n = m; n; n = n->m_next)
+				for (mcnt = 0, n = m; n; n = n->m_next)
 					mcnt += (n->m_flags & M_EXT) ?
 					    n->m_ext.ext_size : MSIZE;
 			}