From owner-p4-projects@FreeBSD.ORG  Wed Jul 15 09:45:06 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B3F921065678; Wed, 15 Jul 2009 09:45:05 +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 706C21065672
	for <perforce@freebsd.org>; Wed, 15 Jul 2009 09:45:05 +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 5EDEB8FC27
	for <perforce@freebsd.org>; Wed, 15 Jul 2009 09:45:05 +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 n6F9j5tk053865
	for <perforce@freebsd.org>; Wed, 15 Jul 2009 09:45:05 GMT
	(envelope-from andre@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n6F9j5g3053863
	for perforce@freebsd.org; Wed, 15 Jul 2009 09:45:05 GMT
	(envelope-from andre@freebsd.org)
Date: Wed, 15 Jul 2009 09:45:05 GMT
Message-Id: <200907150945.n6F9j5g3053863@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 166124 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, 15 Jul 2009 09:45:06 -0000

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

Change 166124 by andre@andre_t61 on 2009/07/15 09:44:11

	Use tcp_sack_free() in all cases.

Affected files ...

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

Differences ...

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

@@ -151,7 +151,7 @@
 		if (SEQ_LT(th_ack, tsb->tsb_blk.start))
 			break;
 		else
-			RB_REMOVE(tcp_sackblocks, &tp->snd_sackblocks, tsb);
+			tcp_sack_free(tp, tsb);
 	}
 
 	if ((to->to_flags & TOF_SACK) && to->to_nsacks == 0) {
@@ -184,7 +184,7 @@
 
 		/* Return match that has at least partial overlap to either side. */
 		if ((tsb = RB_FIND(tcp_sackblocks, &tp->snd_sackblocks, &sack)) != NULL) {
-			/* within a block, was a duplicate retransmit, D-SACK */
+			/* within a block, was a duplicate retransmit, D-SACK. */
 			if (SEQ_GEQ(sack.tsb_blk.start, tsb->tsb_blk.start) &&
 			    SEQ_LEQ(sack.tsb_blk.end, tsb->tsb_blk.end)) {
 				continue;
@@ -235,8 +235,7 @@
 	struct tcp_sack_block *tsb, *tsbn;
 
 	RB_FOREACH_SAFE(tsb, tcp_sackblocks, &tp->snd_sackblocks, tsbn) {
-		RB_REMOVE(tcp_sackblocks, &tp->snd_sackblocks, tsb);
-		uma_zfree(tcp_sackblock_zone, tsb);
+		tcp_sack_free(tp, tsb);
 	}
 }