From owner-p4-projects@FreeBSD.ORG  Thu Apr 19 07:39:15 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 99A1C16A402; Thu, 19 Apr 2007 07:39:15 +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 6F0E116A400
	for <perforce@FreeBSD.org>; Thu, 19 Apr 2007 07:39:15 +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 607A913C468
	for <perforce@FreeBSD.org>; Thu, 19 Apr 2007 07:39:15 +0000 (UTC)
	(envelope-from zec@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3J7dFba023295
	for <perforce@FreeBSD.org>; Thu, 19 Apr 2007 07:39:15 GMT
	(envelope-from zec@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3J7dFng023292
	for perforce@freebsd.org; Thu, 19 Apr 2007 07:39:15 GMT
	(envelope-from zec@FreeBSD.org)
Date: Thu, 19 Apr 2007 07:39:15 GMT
Message-Id: <200704190739.l3J7dFng023292@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 118399 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: Thu, 19 Apr 2007 07:39:16 -0000

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

Change 118399 by zec@zec_tca51 on 2007/04/19 07:38:43

	Fix to allow compilation with nooptions VIMAGE.

Affected files ...

.. //depot/projects/vimage/src/sys/contrib/pf/net/pf_ioctl.c#5 edit

Differences ...

==== //depot/projects/vimage/src/sys/contrib/pf/net/pf_ioctl.c#5 (text+ko) ====

@@ -401,10 +401,14 @@
 	callout_reset(&V_pf_expire_to, my_timeout[PFTM_INTERVAL] * hz,
 	    pf_purge_timeout, curvnet);
 
-if (curvnet == &vnet_0) {
+#ifdef VIMAGE
+	if (curvnet == &vnet_0) {
+#endif
 	pf_normalize_init();
 	pf_pfil_hooked = 0;
-}
+#ifdef VIMAGE
+	}
+#endif
 
 	bzero(&V_pf_status, sizeof(V_pf_status));
 	/* XXX do our best to avoid a conflict */