PERFORCE change 147549 for review

[Dag-Erling Smorgrav]

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

Change 147549 by des at des.at.des.no on 2008/08/16 15:13:07

	Fix #include <sys/vimage.h> in the wrong place.
	Update __FreeBSD_version check.

Affected files ...

.. //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/fil.c#6 edit
.. //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#7 edit

Differences ...

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

@@ -27,13 +27,15 @@
 #if defined(_KERNEL) && defined(__FreeBSD_version) && \
     (__FreeBSD_version >= 220000)
 # if (__FreeBSD_version >= 400000)
-#  if (__FreeBSD_version >= 800000)
+#  if !defined(IPFILTER_LKM)
 #   include "opt_inet6.h"
-#   include <sys/vimage.h>
 #  endif
 #  if (__FreeBSD_version == 400019)
 #   define CSUM_DELAY_DATA
 #  endif
+#  if (__FreeBSD_version >= 800044)
+#   include <sys/vimage.h>
+#  endif
 # endif
 # include <sys/filio.h>
 #else

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

@@ -62,7 +62,7 @@
 #else
 # include <sys/select.h>
 #endif
-#if __FreeBSD_version >= 800000
+#if __FreeBSD_version >= 800044
 # include <sys/vimage.h>
 #else
 #define V_path_mtu_discovery path_mtu_discovery