PERFORCE change 143355 for review

[Julian Elischer]

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

Change 143355 by julian at 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__ */