From owner-p4-projects@FreeBSD.ORG  Fri Jul 13 13:01:05 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 8E50B16A40F; Fri, 13 Jul 2007 13:01:05 +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 5F5D316A407
	for <perforce@FreeBSD.org>; Fri, 13 Jul 2007 13:01:05 +0000 (UTC)
	(envelope-from anchie@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 4E8B413C4D1
	for <perforce@FreeBSD.org>; Fri, 13 Jul 2007 13:01:05 +0000 (UTC)
	(envelope-from anchie@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 l6DD15TI084247
	for <perforce@FreeBSD.org>; Fri, 13 Jul 2007 13:01:05 GMT
	(envelope-from anchie@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6DD15es084243
	for perforce@freebsd.org; Fri, 13 Jul 2007 13:01:05 GMT
	(envelope-from anchie@FreeBSD.org)
Date: Fri, 13 Jul 2007 13:01:05 GMT
Message-Id: <200707131301.l6DD15es084243@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	anchie@FreeBSD.org using -f
From: Ana Kukec <anchie@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 123438 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, 13 Jul 2007 13:01:05 -0000

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

Change 123438 by anchie@anchie_malimis on 2007/07/13 13:00:13

	Remove a stale printf(). 
	
	Do not schedule key_timehandler() more than once.	

Affected files ...

.. //depot/projects/vimage/src/sys/netipsec/key.c#6 edit

Differences ...

==== //depot/projects/vimage/src/sys/netipsec/key.c#6 (text+ko) ====

@@ -7149,8 +7149,6 @@
 	INIT_VNET_IPSEC(curvnet);
 	int i;
 
-	printf(" ---> key_init <---\n");
-
 	V_key_debug_level = 0;
 	V_key_spi_trycnt = 1000;
 	V_key_spi_minval = 0x100;
@@ -7201,7 +7199,13 @@
 	V_ip4_def_policy.refcnt++;	/*never reclaim this*/
 
 #ifndef IPSEC_DEBUG2
+#ifdef VIMAGE
+	if (curvnet == &vnet_0) {
+#endif
 	timeout((void *)key_timehandler, (void *)0, hz);
+#ifdef VIMAGE
+	}
+#endif
 #endif /*IPSEC_DEBUG2*/
 
 	/* initialize key statistics */