From owner-p4-projects@FreeBSD.ORG  Sat Aug 16 15:14:03 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id CEA1E1065675; Sat, 16 Aug 2008 15:14:03 +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 900DD1065673
	for <perforce@freebsd.org>; Sat, 16 Aug 2008 15:14:03 +0000 (UTC)
	(envelope-from des@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 779FC8FC0C
	for <perforce@freebsd.org>; Sat, 16 Aug 2008 15:14:03 +0000 (UTC)
	(envelope-from des@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7GFE32B027730
	for <perforce@freebsd.org>; Sat, 16 Aug 2008 15:14:03 GMT
	(envelope-from des@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7GFE38J027728
	for perforce@freebsd.org; Sat, 16 Aug 2008 15:14:03 GMT
	(envelope-from des@freebsd.org)
Date: Sat, 16 Aug 2008 15:14:03 GMT
Message-Id: <200808161514.m7GFE38J027728@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	des@freebsd.org using -f
From: Dag-Erling Smorgrav <des@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 147549 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, 16 Aug 2008 15:14:04 -0000

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

Change 147549 by des@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