From owner-p4-projects@FreeBSD.ORG  Thu Jul 23 20:54:27 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 017061065675; Thu, 23 Jul 2009 20:54:27 +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 B1ADF1065673
	for <perforce@freebsd.org>; Thu, 23 Jul 2009 20:54:26 +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 9F1718FC15
	for <perforce@freebsd.org>; Thu, 23 Jul 2009 20:54:26 +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 n6NKsQTY087120
	for <perforce@freebsd.org>; Thu, 23 Jul 2009 20:54:26 GMT
	(envelope-from andre@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n6NKsQiB087118
	for perforce@freebsd.org; Thu, 23 Jul 2009 20:54:26 GMT
	(envelope-from andre@freebsd.org)
Date: Thu, 23 Jul 2009 20:54:26 GMT
Message-Id: <200907232054.n6NKsQiB087118@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 166476 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: Thu, 23 Jul 2009 20:54:27 -0000

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

Change 166476 by andre@andre_t61 on 2009/07/23 20:54:23

	Be more consistent with the sequence space comparisons.
	Have uma_zalloc zero out the structure on allocation.

Affected files ...

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

Differences ...

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

@@ -267,7 +267,7 @@
 				sacked += SEQ_DELTA(tsb->tsb_blk.end, sack.tsb_blk.end);
 				tsb->tsb_blk.end = sack.tsb_blk.end;
 				while ((tsbn = RB_NEXT(tcp_sackblocks, &tp->snd_sackblocks, tsb)) != NULL &&
-				    SEQ_GEQ(tsbn->tsb_blk.start, tsb->tsb_blk.end)) {
+				    SEQ_GEQ(tsb->tsb_blk.end, tsbn->tsb_blk.start)) {
 					sacked -= SEQ_DELTA(sack.tsb_blk.end, tsbn->tsb_blk.start);
 					if (SEQ_GT(tsbn->tsb_blk.end, tsb->tsb_blk.end))
 						tsb->tsb_blk.end = tsbn->tsb_blk.end;
@@ -279,14 +279,14 @@
 				sacked += SEQ_DELTA(sack.tsb_blk.start, tsb->tsb_blk.start);
 				tsb->tsb_blk.start = sack.tsb_blk.start;
 				while ((tsbn = RB_PREV(tcp_sackblocks, &tp->snd_sackblocks, tsb)) != NULL &&
-				    SEQ_GEQ(tsbn->tsb_blk.end, tsb->tsb_blk.start)) {
+				    SEQ_LEQ(tsb->tsb_blk.start, tsbn->tsb_blk.end)) {
 					sacked -= SEQ_DELTA(sack.tsb_blk.start, tsbn->tsb_blk.end);
 					if (SEQ_LT(tsbn->tsb_blk.start, tsb->tsb_blk.start))
 						tsb->tsb_blk.start = tsbn->tsb_blk.start;
 					tcp_sack_free(tp, tsbn);
 				}
 			}
-		} else if ((tsb = (struct tcp_sack_block *)uma_zalloc(tcp_sackblock_zone, M_NOWAIT)) != NULL) {
+		} else if ((tsb = (struct tcp_sack_block *)uma_zalloc(tcp_sackblock_zone, (M_NOWAIT|M_ZERO))) != NULL) {
 			sacked += SEQ_DELTA(sack.tsb_blk.start, sack.tsb_blk.end);
 			tsb->tsb_blk.start = sack.tsb_blk.start;
 			tsb->tsb_blk.end = sack.tsb_blk.end;