From owner-p4-projects@FreeBSD.ORG  Fri Dec 14 22:26:06 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2042616A478; Fri, 14 Dec 2007 22:26:06 +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 A5A4B16A419
	for <perforce@freebsd.org>; Fri, 14 Dec 2007 22:26:05 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 84F2913C45A
	for <perforce@freebsd.org>; Fri, 14 Dec 2007 22:26:05 +0000 (UTC)
	(envelope-from jb@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 lBEMQ58K037079
	for <perforce@freebsd.org>; Fri, 14 Dec 2007 22:26:05 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBEMQ5mh037076
	for perforce@freebsd.org; Fri, 14 Dec 2007 22:26:05 GMT
	(envelope-from jb@freebsd.org)
Date: Fri, 14 Dec 2007 22:26:05 GMT
Message-Id: <200712142226.lBEMQ5mh037076@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 130899 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: Fri, 14 Dec 2007 22:26:06 -0000

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

Change 130899 by jb@jb_freebsd1 on 2007/12/14 22:25:04

	IF6

Affected files ...

.. //depot/projects/dtrace6/src/sys/netinet/tcp_subr.c#2 integrate

Differences ...

==== //depot/projects/dtrace6/src/sys/netinet/tcp_subr.c#2 (text+ko) ====

@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_subr.c	8.2 (Berkeley) 5/24/95
- * $FreeBSD: src/sys/netinet/tcp_subr.c,v 1.228.2.14 2006/12/30 17:58:46 jhb Exp $
+ * $FreeBSD: src/sys/netinet/tcp_subr.c,v 1.228.2.15 2007/12/14 19:23:31 qingli Exp $
  */
 
 #include "opt_compat.h"
@@ -1470,7 +1470,7 @@
 }
 
 /*
- * Increment the offset to the next ISN_BYTES_PER_SECOND / hz boundary
+ * Increment the offset to the next ISN_BYTES_PER_SECOND / 100 boundary
  * to keep time flowing at a relatively constant rate.  If the random
  * increments have already pushed us past the projected offset, do nothing.
  */
@@ -1483,7 +1483,7 @@
 	INP_INFO_WLOCK(&tcbinfo);
 	projected_offset = isn_offset_old + ISN_BYTES_PER_SECOND / 100;
 
-	if (projected_offset > isn_offset)
+	if (SEQ_GT(projected_offset, isn_offset))
 		isn_offset = projected_offset;
 
 	isn_offset_old = isn_offset;