From owner-p4-projects@FreeBSD.ORG  Thu Jun 12 08:12: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 08AC21065674; Thu, 12 Jun 2008 08:12: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 BF290106566B
	for <perforce@freebsd.org>; Thu, 12 Jun 2008 08:12:02 +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 AAAF48FC12
	for <perforce@freebsd.org>; Thu, 12 Jun 2008 08:12:02 +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 m5C8C2SD087602
	for <perforce@freebsd.org>; Thu, 12 Jun 2008 08:12:02 GMT
	(envelope-from julian@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5C8C299087600
	for perforce@freebsd.org; Thu, 12 Jun 2008 08:12:02 GMT
	(envelope-from julian@freebsd.org)
Date: Thu, 12 Jun 2008 08:12:02 GMT
Message-Id: <200806120812.m5C8C299087600@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 143355 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, 12 Jun 2008 08:12:03 -0000

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

Change 143355 by julian@julian_trafmon1 on 2008/06/12 08:11:21

	 remove duplicates

Affected files ...

.. //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#3 edit
.. //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf.c#3 edit
.. //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf_ioctl.c#3 edit

Differences ...

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

@@ -39,7 +39,13 @@
 #include <sys/errno.h>
 #include <sys/types.h>
 #include <sys/file.h>
-#include <sys/vimage.h>
+#if __FreeBSD_version > 800000
+# include <sys/vimage.h>
+#else
+# define V_ipforwarding ipforwarding
+# define V_path_mtu_discovery path_mtu_discovery
+# define V_ip_defttl ip_defttl
+#endif
 #if __FreeBSD_version >= 220000
 # include <sys/fcntl.h>
 # include <sys/filio.h>
@@ -111,7 +117,6 @@
 # include <sys/malloc.h>
 #endif
 #include <sys/kernel.h>
-#include <sys/vimage.h>
 #ifdef CSUM_DATA_VALID
 #include <machine/in_cksum.h>
 #endif

==== //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf.c#3 (text+ko) ====

@@ -145,7 +145,6 @@
 #include <machine/in_cksum.h>
 #include <sys/limits.h>
 #include <sys/ucred.h>
-#include <sys/vimage.h>
 #include <security/mac/mac_framework.h>
 
 extern int ip_optcopy(struct ip *, struct ip *);

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

@@ -137,7 +137,6 @@
 #include <sys/limits.h>
 #include <sys/lock.h>
 #include <sys/mutex.h>
-#include <sys/vimage.h>
 #include <net/pfil.h>
 #endif /* __FreeBSD__ */