From owner-p4-projects@FreeBSD.ORG  Tue Aug 26 23:37:31 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2B5131065682; Tue, 26 Aug 2008 23:37:31 +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 E35D2106567D
	for <perforce@freebsd.org>; Tue, 26 Aug 2008 23:37:30 +0000 (UTC)
	(envelope-from julian@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 9F5EC8FC08
	for <perforce@freebsd.org>; Tue, 26 Aug 2008 23:37:30 +0000 (UTC)
	(envelope-from julian@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7QNbUnZ037065
	for <perforce@freebsd.org>; Tue, 26 Aug 2008 23:37:30 GMT
	(envelope-from julian@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7QNbUKb037063
	for perforce@freebsd.org; Tue, 26 Aug 2008 23:37:30 GMT
	(envelope-from julian@freebsd.org)
Date: Tue, 26 Aug 2008 23:37:30 GMT
Message-Id: <200808262337.m7QNbUKb037063@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	julian@freebsd.org using -f
From: Julian Elischer <julian@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 148563 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: Tue, 26 Aug 2008 23:37:31 -0000

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

Change 148563 by julian@julian_trafmon1 on 2008/08/26 23:37:24

	fix mismerge  tcp_hc_purge requires the vnet to use as an argument.

Affected files ...

.. //depot/projects/vimage/src/sys/netinet/tcp_hostcache.c#23 edit

Differences ...

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

@@ -226,7 +226,7 @@
 	 */
 	callout_init(&V_tcp_hc_callout, CALLOUT_MPSAFE);
 	callout_reset(&V_tcp_hc_callout, V_tcp_hostcache.prune * hz,
-	    tcp_hc_purge, 0);
+	    tcp_hc_purge, curvnet);
 }
 
 void