From owner-p4-projects@FreeBSD.ORG  Wed Aug  1 00:26:26 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5C56B16A421; Wed,  1 Aug 2007 00:26:26 +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 21BB716A41F
	for <perforce@freebsd.org>; Wed,  1 Aug 2007 00:26:26 +0000 (UTC)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id F40C213C46B
	for <perforce@freebsd.org>; Wed,  1 Aug 2007 00:26:25 +0000 (UTC)
	(envelope-from peter@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 l710QPwF020291
	for <perforce@freebsd.org>; Wed, 1 Aug 2007 00:26:25 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l710QPHh020288
	for perforce@freebsd.org; Wed, 1 Aug 2007 00:26:25 GMT
	(envelope-from peter@freebsd.org)
Date: Wed, 1 Aug 2007 00:26:25 GMT
Message-Id: <200708010026.l710QPHh020288@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 124444 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, 01 Aug 2007 00:26:26 -0000

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

Change 124444 by peter@peter_daintree on 2007/08/01 00:26:09

	Revert to vendor.  Done differently in cvs.

Affected files ...

.. //depot/projects/hammer/sys/netinet/tcp_subr.c#72 edit

Differences ...

==== //depot/projects/hammer/sys/netinet/tcp_subr.c#72 (text+ko) ====

@@ -258,7 +258,7 @@
 	tcp_keepintvl = TCPTV_KEEPINTVL;
 	tcp_maxpersistidle = TCPTV_KEEP_IDLE;
 	tcp_msl = TCPTV_MSL;
-	tcp_rexmit_min = TCPTV_MIN < 1 ? 1 : TCPTV_MIN;
+	tcp_rexmit_min = TCPTV_MIN;
 	if (tcp_rexmit_min < 1)
 		tcp_rexmit_min = 1;
 	tcp_rexmit_slop = TCPTV_CPU_VAR;