From owner-p4-projects@FreeBSD.ORG  Sat Jun 21 01:47:08 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 907C21065673; Sat, 21 Jun 2008 01:47:08 +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 52E19106564A
	for <perforce@freebsd.org>; Sat, 21 Jun 2008 01:47:08 +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 DAD798FC12
	for <perforce@freebsd.org>; Sat, 21 Jun 2008 01:47:07 +0000 (UTC)
	(envelope-from julian@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 m5L1l73M036926
	for <perforce@freebsd.org>; Sat, 21 Jun 2008 01:47:07 GMT
	(envelope-from julian@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5L1l7ZM036924
	for perforce@freebsd.org; Sat, 21 Jun 2008 01:47:07 GMT
	(envelope-from julian@freebsd.org)
Date: Sat, 21 Jun 2008 01:47:07 GMT
Message-Id: <200806210147.m5L1l7ZM036924@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 143854 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: Sat, 21 Jun 2008 01:47:08 -0000

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

Change 143854 by julian@julian_trafmon1 on 2008/06/21 01:46:22

	Some things need vimage.h because of ip_var.h needing it

Affected files ...

.. //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_frag.c#4 edit
.. //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_log.c#4 edit
.. //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_nat.c#4 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/sctp_os_bsd.h#5 edit

Differences ...

==== //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_frag.c#4 (text+ko) ====

@@ -58,6 +58,10 @@
 # include <sys/stream.h>
 # include <sys/kmem.h>
 #endif
+#if (__FreeBSD_version > 800000)
+# include "opt_vimage.h"
+# include <sys/vimage.h>
+#endif
 #include <net/if.h>
 #ifdef sun
 # include <net/af.h>
@@ -86,10 +90,6 @@
 #  ifndef IPFILTER_LKM
 #   include <sys/libkern.h>
 #   include <sys/systm.h>
-#   if (__FreeBSD_version > 800000)
-#    include "opt_vimage.h"
-#    include <sys/vimage.h>
-#   endif
 #  endif
 extern struct callout_handle fr_slowtimer_ch;
 # endif

==== //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_log.c#4 (text+ko) ====

@@ -104,6 +104,10 @@
 #if __FreeBSD_version >= 300000
 # include <net/if_var.h>
 #endif
+#if __FreeBSD_version >= 800000
+# include "opt_vimage.h"
+# include <sys/vimage.h>
+#endif
 #include <net/route.h>
 #include <netinet/in.h>
 #ifdef __sgi

==== //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_nat.c#4 (text+ko) ====

@@ -70,6 +70,10 @@
 #if __FreeBSD_version >= 300000
 # include <sys/queue.h>
 #endif
+#if __FreeBSD_version >= 800000
+# include "opt_vimage.h"
+# include <sys/vimage.h>
+#endif
 #include <net/if.h>
 #if __FreeBSD_version >= 300000
 # include <net/if_var.h>

==== //depot/projects/vimage-commit2/src/sys/netinet/sctp_os_bsd.h#5 (text+ko) ====

@@ -39,6 +39,7 @@
 #include "opt_inet6.h"
 #include "opt_inet.h"
 #include "opt_sctp.h"
+#include "opt_vimage.h"
 #include <sys/param.h>
 #include <sys/ktr.h>
 #include <sys/systm.h>
@@ -60,6 +61,7 @@
 #include <sys/random.h>
 #include <sys/limits.h>
 #include <sys/queue.h>
+#include <sys/vimage.h>
 #include <machine/cpu.h>
 
 #include <net/if.h>