From owner-p4-projects@FreeBSD.ORG  Wed Jan 24 22:47:01 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id F36C116A402; Wed, 24 Jan 2007 22:47:00 +0000 (UTC)
X-Original-To: perforce@FreeBSD.org
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id AB36D16A400
	for <perforce@FreeBSD.org>; Wed, 24 Jan 2007 22:47:00 +0000 (UTC)
	(envelope-from zec@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 9D63113C441
	for <perforce@FreeBSD.org>; Wed, 24 Jan 2007 22:47:00 +0000 (UTC)
	(envelope-from zec@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0OMl0R7017997
	for <perforce@FreeBSD.org>; Wed, 24 Jan 2007 22:47:00 GMT
	(envelope-from zec@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0OMl0i4017992
	for perforce@freebsd.org; Wed, 24 Jan 2007 22:47:00 GMT
	(envelope-from zec@FreeBSD.org)
Date: Wed, 24 Jan 2007 22:47:00 GMT
Message-Id: <200701242247.l0OMl0i4017992@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	zec@FreeBSD.org using -f
From: Marko Zec <zec@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 113484 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, 24 Jan 2007 22:47:01 -0000

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

Change 113484 by zec@zec_tca51 on 2007/01/24 22:46:29

	Back out a few bits leaked from an uncommited set of
	changes.

Affected files ...

.. //depot/projects/vimage/src/sys/netinet/tcp_subr.c#9 edit

Differences ...

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

@@ -189,17 +189,16 @@
 static int
 tcptw_auto_size(void)
 {
-	INIT_VNET_INET(curvnetb);
 	int halfrange;
 
 	/*
 	 * Max out at half the ephemeral port range so that TIME_WAIT
 	 * sockets don't tie up too many ephemeral ports.
 	 */
-	if (V_ipport_lastauto > V_ipport_firstauto)
-		halfrange = (V_ipport_lastauto - V_ipport_firstauto) / 2;
+	if (ipport_lastauto > ipport_firstauto)
+		halfrange = (ipport_lastauto - ipport_firstauto) / 2;
 	else
-		halfrange = (V_ipport_firstauto - V_ipport_lastauto) / 2;
+		halfrange = (ipport_firstauto - ipport_lastauto) / 2;
 	/* Protect against goofy port ranges smaller than 32. */
 	return (imin(imax(halfrange, 32), maxsockets / 5));
 }