From owner-p4-projects@FreeBSD.ORG  Sat Jul 25 18:01:52 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5D3481065670; Sat, 25 Jul 2009 18:01:52 +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 1D879106566B
	for <perforce@freebsd.org>; Sat, 25 Jul 2009 18:01:52 +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 0B5888FC0C
	for <perforce@freebsd.org>; Sat, 25 Jul 2009 18:01:52 +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 n6PI1pmN039548
	for <perforce@freebsd.org>; Sat, 25 Jul 2009 18:01:51 GMT
	(envelope-from andre@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n6PI1pT0039546
	for perforce@freebsd.org; Sat, 25 Jul 2009 18:01:51 GMT
	(envelope-from andre@freebsd.org)
Date: Sat, 25 Jul 2009 18:01:51 GMT
Message-Id: <200907251801.n6PI1pT0039546@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 166563 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: Sat, 25 Jul 2009 18:01:53 -0000

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

Change 166563 by andre@andre_t61 on 2009/07/25 18:01:26

	Move snd_sacked reduction tracking from tcp_sack_flush to tcp_sack_free.

Affected files ...

.. //depot/projects/tcp_new/netinet/tcp_sack.c#13 edit

Differences ...

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

@@ -157,6 +157,7 @@
 
 	sb = RB_REMOVE(tcp_sackblocks, &tp->snd_sackblocks, tsb);
 	KASSERT(sb != NULL, ("%s: RB_REMOVE failed", __func__));
+	tp->snd_sacked -= SEQ_DELTA(tsb->tsb_blk.start, tsb->tsb_blk.end);
 	uma_zfree(tcp_sackblock_zone, tsb);
 }
 
@@ -166,7 +167,6 @@
 	struct tcp_sack_block *tsb, *tsbn;
 
 	RB_FOREACH_SAFE(tsb, tcp_sackblocks, &tp->snd_sackblocks, tsbn) {
-		tp->snd_sacked -= SEQ_DELTA(tsb->tsb_blk.start, tsb->tsb_blk.end);
 		tcp_sack_free(tp, tsb);
 	}
 	KASSERT(tp->snd_sacked == 0, ("%s: snd_sacked not zero", __func__));
@@ -200,7 +200,7 @@
 	}
 
 	/*
-	 * SACK header but no blocks or no SACK information even though
+	 * SACK header but no blocks nor SACK information even though
 	 * it was sent before.
 	 */
 	if ((to->to_flags & TOF_SACK) && to->to_nsacks == 0)