PERFORCE change 143854 for review

[Julian Elischer]

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

Change 143854 by julian at 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>