From owner-p4-projects@FreeBSD.ORG  Sat Aug 16 19:50:59 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6330F1065694; Sat, 16 Aug 2008 19:50:59 +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 27447106568B
	for <perforce@freebsd.org>; Sat, 16 Aug 2008 19:50:59 +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 120B28FC14
	for <perforce@freebsd.org>; Sat, 16 Aug 2008 19:50:59 +0000 (UTC)
	(envelope-from julian@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 m7GJow87063931
	for <perforce@freebsd.org>; Sat, 16 Aug 2008 19:50:58 GMT
	(envelope-from julian@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7GJowfw063929
	for perforce@freebsd.org; Sat, 16 Aug 2008 19:50:58 GMT
	(envelope-from julian@freebsd.org)
Date: Sat, 16 Aug 2008 19:50:58 GMT
Message-Id: <200808161950.m7GJowfw063929@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 147586 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 19:50:59 -0000

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

Change 147586 by julian@julian_trafmon1 on 2008/08/16 19:50:25

	IF-commit2@147581  "DES-ification"

Affected files ...

.. //depot/projects/vimage-commit3/src/sys/amd64/amd64/dump_machdep.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/amd64/amd64/minidump_machdep.c#5 integrate
.. //depot/projects/vimage-commit3/src/sys/arm/arm/dump_machdep.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/compat/linprocfs/linprocfs.c#4 integrate
.. //depot/projects/vimage-commit3/src/sys/compat/linux/linux_ioctl.c#5 integrate
.. //depot/projects/vimage-commit3/src/sys/compat/svr4/svr4_sockio.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/conf/options#4 integrate
.. //depot/projects/vimage-commit3/src/sys/contrib/ipfilter/netinet/fil.c#5 integrate
.. //depot/projects/vimage-commit3/src/sys/contrib/ipfilter/netinet/ip_auth.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/contrib/ipfilter/netinet/ip_frag.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/contrib/ipfilter/netinet/ip_log.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/contrib/ipfilter/netinet/ip_nat.c#4 integrate
.. //depot/projects/vimage-commit3/src/sys/contrib/ipfilter/netinet/ip_proxy.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/contrib/ipfilter/netinet/ip_state.c#4 integrate
.. //depot/projects/vimage-commit3/src/sys/contrib/ipfilter/netinet/ip_sync.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/contrib/pf/net/if_pfsync.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/contrib/pf/net/pf_norm.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/contrib/pf/net/pf_subr.c#2 integrate
.. //depot/projects/vimage-commit3/src/sys/contrib/pf/netinet/in4_cksum.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/contrib/rdma/rdma_cma.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/dev/firewire/firewire.c#4 integrate
.. //depot/projects/vimage-commit3/src/sys/dev/lmc/if_lmc.c#5 integrate
.. //depot/projects/vimage-commit3/src/sys/dev/syscons/daemon/daemon_saver.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/fs/cd9660/cd9660_rrip.c#5 integrate
.. //depot/projects/vimage-commit3/src/sys/geom/vinum/geom_vinum_drive.c#4 integrate
.. //depot/projects/vimage-commit3/src/sys/i386/conf/NOTES#6 integrate
.. //depot/projects/vimage-commit3/src/sys/i386/i386/dump_machdep.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/i386/i386/minidump_machdep.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/i386/ibcs2/ibcs2_socksys.c#4 integrate
.. //depot/projects/vimage-commit3/src/sys/ia64/ia64/dump_machdep.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/kern/kern_jail.c#6 integrate
.. //depot/projects/vimage-commit3/src/sys/kern/kern_uuid.c#4 integrate
.. //depot/projects/vimage-commit3/src/sys/net/bridgestp.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/net/if_enc.c#4 integrate
.. //depot/projects/vimage-commit3/src/sys/net/if_gre.c#6 integrate
.. //depot/projects/vimage-commit3/src/sys/net/if_mib.c#4 integrate
.. //depot/projects/vimage-commit3/src/sys/net/raw_cb.c#6 integrate
.. //depot/projects/vimage-commit3/src/sys/net/raw_usrreq.c#6 integrate
.. //depot/projects/vimage-commit3/src/sys/net/rtsock.c#5 integrate
.. //depot/projects/vimage-commit3/src/sys/net80211/ieee80211.c#4 integrate
.. //depot/projects/vimage-commit3/src/sys/netgraph/ng_base.c#6 integrate
.. //depot/projects/vimage-commit3/src/sys/netgraph/ng_bridge.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/netgraph/ng_eiface.c#4 integrate
.. //depot/projects/vimage-commit3/src/sys/netgraph/ng_ether.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/netgraph/ng_gif.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/netgraph/ng_ipfw.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/netgraph/ng_nat.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/netgraph/ng_source.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet/in_mcast.c#4 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet/in_proto.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet/in_rmx.c#4 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet/ip_dummynet.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet/ip_encap.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet/ip_fw2.c#5 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet/ip_gre.c#4 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet/ip_id.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet/ip_var.h#2 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet/sctp_os_bsd.h#4 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet/tcp_debug.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet6/frag6.c#5 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet6/in6_ifattach.c#5 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet6/in6_rmx.c#6 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet6/scope6.c#5 integrate
.. //depot/projects/vimage-commit3/src/sys/netipsec/xform_ah.c#4 integrate
.. //depot/projects/vimage-commit3/src/sys/netipsec/xform_esp.c#4 integrate
.. //depot/projects/vimage-commit3/src/sys/rpc/authunix_prot.c#6 integrate
.. //depot/projects/vimage-commit3/src/sys/security/mac/mac_inet.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/security/mac/mac_socket.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/security/mac_biba/mac_biba.c#5 integrate
.. //depot/projects/vimage-commit3/src/sys/security/mac_lomac/mac_lomac.c#4 integrate
.. //depot/projects/vimage-commit3/src/sys/security/mac_mls/mac_mls.c#5 integrate
.. //depot/projects/vimage-commit3/src/sys/security/mac_stub/mac_stub.c#4 integrate
.. //depot/projects/vimage-commit3/src/sys/sparc64/sparc64/dump_machdep.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/sun4v/sun4v/dump_machdep.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/sys/param.h#5 integrate
.. //depot/projects/vimage-commit3/src/sys/sys/vimage.h#5 integrate

Differences ...

==== //depot/projects/vimage-commit3/src/sys/amd64/amd64/dump_machdep.c#3 (text+ko) ====

@@ -27,7 +27,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.14 2008/02/15 06:26:25 scottl Exp $");
 
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>

==== //depot/projects/vimage-commit3/src/sys/amd64/amd64/minidump_machdep.c#5 (text) ====

@@ -27,7 +27,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.6 2008/07/08 04:00:22 alc Exp $");
 
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>

==== //depot/projects/vimage-commit3/src/sys/arm/arm/dump_machdep.c#3 (text+ko) ====

@@ -27,7 +27,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/sys/arm/arm/dump_machdep.c,v 1.3 2008/01/28 19:04:06 ru Exp $");
 
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>

==== //depot/projects/vimage-commit3/src/sys/compat/linprocfs/linprocfs.c#4 (text+ko) ====

@@ -39,8 +39,6 @@
  *	@(#)procfs_status.c	8.4 (Berkeley) 6/15/94
  */
 
-#include "opt_compat.h"
-
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.119 2008/03/31 12:01:18 kib Exp $");
 
@@ -91,6 +89,7 @@
 #include <machine/md_var.h>
 #endif /* __i386__ || __amd64__ */
 
+#include "opt_compat.h"
 #ifdef COMPAT_LINUX32				/* XXX */
 #include <machine/../linux32/linux.h>
 #else

==== //depot/projects/vimage-commit3/src/sys/compat/linux/linux_ioctl.c#5 (text+ko) ====

@@ -29,8 +29,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.140 2008/07/23 17:47:44 ed Exp $");
 
-#include "opt_compat.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sysproto.h>
@@ -64,6 +62,8 @@
 #include <net/if_dl.h>
 #include <net/if_types.h>
 
+#include "opt_compat.h"
+
 #ifdef COMPAT_LINUX32
 #include <machine/../linux32/linux.h>
 #include <machine/../linux32/linux32_proto.h>

==== //depot/projects/vimage-commit3/src/sys/compat/svr4/svr4_sockio.c#3 (text+ko) ====

@@ -29,7 +29,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_sockio.c,v 1.18 2006/08/04 21:15:09 brooks Exp $");
 
-
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/systm.h>

==== //depot/projects/vimage-commit3/src/sys/conf/options#4 (text+ko) ====

@@ -768,4 +768,4 @@
 TCP_OFFLOAD_DISABLE	opt_inet.h
 
 # Virtualize the network stack
-VIMAGE			opt_global.h
+VIMAGE

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

@@ -27,12 +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"
 #  endif
 #  if (__FreeBSD_version == 400019)
 #   define CSUM_DELAY_DATA
 #  endif
+#  if (__FreeBSD_version >= 800044)
+#   include <sys/vimage.h>
+#  endif
 # endif
 # if (__FreeBSD_version >= 800000)
 #  include <sys/vimage.h>

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

@@ -55,7 +55,6 @@
 #if (defined(_BSDI_VERSION) && _BSDI_VERSION >= 199802) || \
     (defined(__FreeBSD_version) &&(__FreeBSD_version >= 400000))
 # include <sys/queue.h>
-# include <sys/vimage.h>
 #endif
 #if defined(__NetBSD__) || defined(__OpenBSD__) || defined(bsdi)
 # include <machine/cpu.h>

==== //depot/projects/vimage-commit3/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#3 (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

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

@@ -58,9 +58,6 @@
 # include <sys/stream.h>
 # include <sys/kmem.h>
 #endif
-#if (__FreeBSD_version > 800000)
-# include <sys/vimage.h>
-#endif
 #include <net/if.h>
 #ifdef sun
 # include <net/af.h>

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

@@ -104,9 +104,6 @@
 #if __FreeBSD_version >= 300000
 # include <net/if_var.h>
 #endif
-#if __FreeBSD_version >= 800000
-# include <sys/vimage.h>
-#endif
 #include <net/route.h>
 #include <netinet/in.h>
 #ifdef __sgi

==== //depot/projects/vimage-commit3/src/sys/contrib/ipfilter/netinet/ip_nat.c#4 (text+ko) ====

@@ -70,9 +70,6 @@
 #if __FreeBSD_version >= 300000
 # include <sys/queue.h>
 #endif
-#if __FreeBSD_version >= 800000
-# include <sys/vimage.h>
-#endif
 #include <net/if.h>
 #if __FreeBSD_version >= 300000
 # include <net/if_var.h>

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

@@ -49,9 +49,6 @@
 #if defined(_KERNEL) && (__FreeBSD_version >= 220000)
 # include <sys/filio.h>
 # include <sys/fcntl.h>
-# if (__FreeBSD_version > 800000)
-#  include <sys/vimage.h>
-# endif   
 # if (__FreeBSD_version >= 300000) && !defined(IPFILTER_LKM)
 #  include "opt_ipfilter.h"
 # endif

==== //depot/projects/vimage-commit3/src/sys/contrib/ipfilter/netinet/ip_state.c#4 (text+ko) ====

@@ -44,9 +44,6 @@
 # if (__FreeBSD_version >= 300000) && !defined(IPFILTER_LKM)
 #  include "opt_ipfilter.h"
 # endif
-# if (__FreeBSD_version > 800000)
-#  include <sys/vimage.h>
-# endif   
 #else
 # include <sys/ioctl.h>
 #endif

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

@@ -42,9 +42,6 @@
 # if (__FreeBSD_version >= 300000) && !defined(IPFILTER_LKM)
 #  include "opt_ipfilter.h"
 # endif
-# if (__FreeBSD_version > 800000)
-#  include <sys/vimage.h>
-# endif   
 #else
 # include <sys/ioctl.h>
 #endif

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

@@ -73,7 +73,6 @@
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/sysctl.h>
-#include <sys/vimage.h>
 #else
 #include <sys/ioctl.h>
 #include <sys/timeout.h>

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

@@ -50,7 +50,6 @@
 #include <sys/socket.h>
 #include <sys/kernel.h>
 #include <sys/time.h>
-#include <sys/vimage.h>
 #ifndef __FreeBSD__
 #include <sys/pool.h>
 

==== //depot/projects/vimage-commit3/src/sys/contrib/pf/net/pf_subr.c#2 (text+ko) ====

@@ -40,7 +40,6 @@
 #include <sys/mbuf.h>
 #include <sys/md5.h>
 #include <sys/time.h>
-#include <sys/vimage.h>
 #include <sys/random.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>

==== //depot/projects/vimage-commit3/src/sys/contrib/pf/netinet/in4_cksum.c#3 (text+ko) ====

@@ -63,11 +63,9 @@
  *	@(#)in_cksum.c	8.1 (Berkeley) 6/10/93
  */
 
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
-#include <sys/vimage.h>
 
 #include <netinet/in.h>
 #include <netinet/in_systm.h>

==== //depot/projects/vimage-commit3/src/sys/contrib/rdma/rdma_cma.c#3 (text+ko) ====

@@ -29,7 +29,6 @@
  *
  */
 
-
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/sys/contrib/rdma/rdma_cma.c,v 1.1 2008/05/05 18:35:54 kmacy Exp $");
 

==== //depot/projects/vimage-commit3/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c#3 (text+ko) ====

@@ -26,7 +26,6 @@
 POSSIBILITY OF SUCH DAMAGE.
 
 ***************************************************************************/
-
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c,v 1.1 2008/05/05 18:46:18 kmacy Exp $");
 
@@ -56,7 +55,6 @@
 #include <sys/taskqueue.h>
 #include <sys/proc.h>
 #include <sys/uio.h>
-#include <sys/vimage.h>
 
 #include <net/route.h>
 #include <netinet/in_systm.h>

==== //depot/projects/vimage-commit3/src/sys/dev/firewire/firewire.c#4 (text+ko) ====

@@ -35,7 +35,6 @@
  *
  */
 
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/types.h>

==== //depot/projects/vimage-commit3/src/sys/dev/lmc/if_lmc.c#5 (text+ko) ====

@@ -83,12 +83,6 @@
 # ifndef NETGRAPH
 #  define NETGRAPH 0
 # endif
-# ifndef INET
-#  define INET 0
-# endif
-# ifndef INET6
-#  define INET6 0
-# endif
 # define  P2P 0		/* not in FreeBSD */
 # if (__FreeBSD_version >= 500000)
 #  define NSPPP 1	/* No count devices in FreeBSD 5 */

==== //depot/projects/vimage-commit3/src/sys/dev/syscons/daemon/daemon_saver.c#3 (text+ko) ====

@@ -36,6 +36,7 @@
 #include <sys/sysctl.h>
 #include <sys/consio.h>
 #include <sys/fbio.h>
+#include <sys/vimage.h>
 
 #include <machine/pc/display.h>
 
@@ -352,10 +353,10 @@
 {
 
 	/* XXXRW: Locking -- these can change! */
-	messagelen = strlen(hostname) + 3 + strlen(ostype) + 1 + 
+	messagelen = strlen(G_hostname) + 3 + strlen(ostype) + 1 + 
 	    strlen(osrelease);
 	message = malloc(messagelen + 1, M_DEVBUF, M_WAITOK);
-	sprintf(message, "%s - %s %s", hostname, ostype, osrelease);
+	sprintf(message, "%s - %s %s", G_hostname, ostype, osrelease);
 	blanked = 0;
 	switch (adp->va_mode) {
 	case M_PC98_80x25:

==== //depot/projects/vimage-commit3/src/sys/fs/cd9660/cd9660_rrip.c#5 (text+ko) ====

@@ -34,7 +34,6 @@
  *	@(#)cd9660_rrip.c	8.6 (Berkeley) 12/5/94
  */
 
-
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/sys/fs/cd9660/cd9660_rrip.c,v 1.31 2008/07/05 13:10:10 rwatson Exp $");
 

==== //depot/projects/vimage-commit3/src/sys/geom/vinum/geom_vinum_drive.c#4 (text+ko) ====

@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  */
 
-
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_drive.c,v 1.28 2008/07/05 13:10:10 rwatson Exp $");
 

==== //depot/projects/vimage-commit3/src/sys/i386/conf/NOTES#6 (text+ko) ====

@@ -248,7 +248,6 @@
 #
 # Not all device drivers support this mode of operation at the time of
 # this writing.  See polling(4) for more details.
-#
 
 options 	DEVICE_POLLING
 

==== //depot/projects/vimage-commit3/src/sys/i386/i386/dump_machdep.c#3 (text+ko) ====

@@ -24,7 +24,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/sys/i386/i386/dump_machdep.c,v 1.14 2008/02/15 06:26:25 scottl Exp $");
 

==== //depot/projects/vimage-commit3/src/sys/i386/i386/minidump_machdep.c#3 (text) ====

@@ -24,7 +24,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/sys/i386/i386/minidump_machdep.c,v 1.5 2008/02/15 06:26:25 scottl Exp $");
 

==== //depot/projects/vimage-commit3/src/sys/i386/ibcs2/ibcs2_socksys.c#4 (text+ko) ====

@@ -23,7 +23,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/sys/i386/ibcs2/ibcs2_socksys.c,v 1.23 2008/07/05 13:10:10 rwatson Exp $");
 

==== //depot/projects/vimage-commit3/src/sys/ia64/ia64/dump_machdep.c#3 (text+ko) ====

@@ -27,7 +27,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/sys/ia64/ia64/dump_machdep.c,v 1.14 2008/01/28 19:04:07 ru Exp $");
 
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>

==== //depot/projects/vimage-commit3/src/sys/kern/kern_jail.c#6 (text+ko) ====

@@ -35,7 +35,6 @@
 #include <sys/sysctl.h>
 #include <sys/vnode.h>
 #include <sys/vimage.h>
-
 #include <net/if.h>
 #include <netinet/in.h>
 

==== //depot/projects/vimage-commit3/src/sys/kern/kern_uuid.c#4 (text+ko) ====

@@ -27,7 +27,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/sys/kern/kern_uuid.c,v 1.13 2007/04/23 12:53:00 pjd Exp $");
 
-
 #include <sys/param.h>
 #include <sys/endian.h>
 #include <sys/kernel.h>

==== //depot/projects/vimage-commit3/src/sys/net/bridgestp.c#3 (text+ko) ====

@@ -34,7 +34,6 @@
  * ISO/IEC 802.1D-2004, June 9, 2004.
  */
 
-
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/sys/net/bridgestp.c,v 1.40 2007/12/09 20:47:12 thompsa Exp $");
 

==== //depot/projects/vimage-commit3/src/sys/net/if_enc.c#4 (text+ko) ====

@@ -27,7 +27,6 @@
  * $FreeBSD$
  */
 
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -39,7 +38,6 @@
 #include <sys/socket.h>
 #include <sys/sockio.h>
 #include <sys/sysctl.h>
-#include <sys/vimage.h>
 
 #include <net/if.h>
 #include <net/if_clone.h>

==== //depot/projects/vimage-commit3/src/sys/net/if_gre.c#6 (text+ko) ====

@@ -64,7 +64,6 @@
 #include <sys/sockio.h>
 #include <sys/sysctl.h>
 #include <sys/systm.h>
-#include <sys/vimage.h>
 
 #include <net/ethernet.h>
 #include <net/if.h>

==== //depot/projects/vimage-commit3/src/sys/net/if_mib.c#4 (text+ko) ====

@@ -29,7 +29,6 @@
  * $FreeBSD: src/sys/net/if_mib.c,v 1.18 2006/01/04 12:57:09 harti Exp $
  */
 
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>

==== //depot/projects/vimage-commit3/src/sys/net/raw_cb.c#6 (text+ko) ====

@@ -31,7 +31,6 @@
  * $FreeBSD: src/sys/net/raw_cb.c,v 1.39 2008/07/09 18:41:31 rwatson Exp $
  */
 
-
 #include <sys/param.h>
 #include <sys/domain.h>
 #include <sys/lock.h>

==== //depot/projects/vimage-commit3/src/sys/net/raw_usrreq.c#6 (text+ko) ====

@@ -31,7 +31,6 @@
  * $FreeBSD: src/sys/net/raw_usrreq.c,v 1.46 2008/07/09 15:48:16 rwatson Exp $
  */
 
-
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>

==== //depot/projects/vimage-commit3/src/sys/net/rtsock.c#5 (text+ko) ====

@@ -29,7 +29,6 @@
  *	@(#)rtsock.c	8.7 (Berkeley) 10/12/95
  * $FreeBSD: src/sys/net/rtsock.c,v 1.148 2008/07/09 15:48:16 rwatson Exp $
  */
-
 #include "opt_sctp.h"
 #include "opt_mpath.h"
 

==== //depot/projects/vimage-commit3/src/sys/net80211/ieee80211.c#4 (text+ko) ====

@@ -32,13 +32,11 @@
  */
 #include "opt_wlan.h"
 
-
 #include <sys/param.h>
 #include <sys/systm.h> 
 #include <sys/kernel.h>
  
 #include <sys/socket.h>
-#include <sys/vimage.h>
 
 #include <net/if.h>
 #include <net/if_dl.h>

==== //depot/projects/vimage-commit3/src/sys/netgraph/ng_base.c#6 (text+ko) ====

@@ -46,7 +46,6 @@
  * This file implements the base netgraph code.
  */
 
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/ctype.h>

==== //depot/projects/vimage-commit3/src/sys/netgraph/ng_bridge.c#3 (text+ko) ====

@@ -58,7 +58,6 @@
  * from one port to the other only rarely.
  */
 
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>

==== //depot/projects/vimage-commit3/src/sys/netgraph/ng_eiface.c#4 (text+ko) ====

@@ -28,7 +28,6 @@
  * $FreeBSD: src/sys/netgraph/ng_eiface.c,v 1.39 2007/07/26 10:54:33 glebius Exp $
  */
 
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/errno.h>

==== //depot/projects/vimage-commit3/src/sys/netgraph/ng_ether.c#3 (text+ko) ====

@@ -46,7 +46,6 @@
  * ng_ether(4) netgraph node type
  */
 
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>

==== //depot/projects/vimage-commit3/src/sys/netgraph/ng_gif.c#3 (text+ko) ====

@@ -69,7 +69,6 @@
  * ng_gif(4) netgraph node type
  */
 
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>

==== //depot/projects/vimage-commit3/src/sys/netgraph/ng_ipfw.c#3 (text+ko) ====

@@ -26,7 +26,6 @@
  * $FreeBSD: src/sys/netgraph/ng_ipfw.c,v 1.9 2006/02/14 15:22:24 ru Exp $
  */
 
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -36,7 +35,6 @@
 #include <sys/errno.h>
 #include <sys/socket.h>
 #include <sys/syslog.h>
-#include <sys/vimage.h>
 
 #include <net/if.h>
 

==== //depot/projects/vimage-commit3/src/sys/netgraph/ng_nat.c#3 (text+ko) ====

@@ -26,7 +26,6 @@
  * $FreeBSD: src/sys/netgraph/ng_nat.c,v 1.12 2008/06/01 15:13:32 mav Exp $
  */
 
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -35,7 +34,6 @@
 #include <sys/ctype.h>
 #include <sys/errno.h>
 #include <sys/syslog.h>
-#include <sys/vimage.h>
 
 #include <netinet/in_systm.h>
 #include <netinet/in.h>

==== //depot/projects/vimage-commit3/src/sys/netgraph/ng_source.c#3 (text+ko) ====

@@ -38,7 +38,6 @@
  * Author: Dave Chapeskie <dchapeskie@sandvine.com>
  */
 
-
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/sys/netgraph/ng_source.c,v 1.30 2007/03/02 14:36:19 emaste Exp $");
 

==== //depot/projects/vimage-commit3/src/sys/netinet/in_mcast.c#4 (text+ko) ====

@@ -39,7 +39,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/sys/netinet/in_mcast.c,v 1.5 2008/05/09 23:02:57 julian Exp $");
 
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>

==== //depot/projects/vimage-commit3/src/sys/netinet/in_proto.c#3 (text+ko) ====

@@ -49,7 +49,6 @@
 #include <sys/protosw.h>
 #include <sys/queue.h>
 #include <sys/sysctl.h>
-#include <sys/vimage.h>
 
 #include <net/if.h>
 #include <net/route.h>

==== //depot/projects/vimage-commit3/src/sys/netinet/in_rmx.c#4 (text+ko) ====

@@ -43,7 +43,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/sys/netinet/in_rmx.c,v 1.59 2008/05/09 23:02:57 julian Exp $");
 
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>

==== //depot/projects/vimage-commit3/src/sys/netinet/ip_dummynet.c#3 (text+ko) ====

@@ -70,7 +70,6 @@
 #include <sys/time.h>
 #include <sys/sysctl.h>
 #include <sys/taskqueue.h>
-#include <sys/vimage.h>
 #include <net/if.h>
 #include <net/netisr.h>
 #include <net/route.h>

==== //depot/projects/vimage-commit3/src/sys/netinet/ip_encap.c#3 (text+ko) ====

@@ -71,7 +71,6 @@
 #include <sys/errno.h>
 #include <sys/protosw.h>
 #include <sys/queue.h>
-#include <sys/vimage.h>
 
 #include <net/if.h>
 #include <net/route.h>

==== //depot/projects/vimage-commit3/src/sys/netinet/ip_fw2.c#5 (text+ko) ====

@@ -2317,7 +2317,7 @@
 					printf("IPFW2: IPV6 - Unknown Routing "
 					    "Header type(%d)\n",
 					    ((struct ip6_rthdr *)ulp)->ip6r_type);
-					if (fw_deny_unknown_exthdrs)
+					if (V_fw_deny_unknown_exthdrs)
 					    return (IP_FW_DENY);
 					break;
 				}
@@ -4588,12 +4588,12 @@
 		default_rule.cmd[0].opcode == O_ACCEPT ? "accept" : "deny");
 
 #ifdef IPFIREWALL_VERBOSE
-	fw_verbose = 1;
+	V_fw_verbose = 1;
 #endif
 #ifdef IPFIREWALL_VERBOSE_LIMIT
 	verbose_limit = IPFIREWALL_VERBOSE_LIMIT;
 #endif
-	if (fw_verbose == 0)
+	if (V_fw_verbose == 0)
 		printf("disabled\n");
 	else if (verbose_limit == 0)
 		printf("unlimited\n");

==== //depot/projects/vimage-commit3/src/sys/netinet/ip_gre.c#4 (text+ko) ====

@@ -44,7 +44,6 @@
  * This currently handles IPPROTO_GRE, IPPROTO_MOBILE
  */
 
-
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
@@ -62,7 +61,6 @@
 #include <sys/time.h>
 #include <sys/kernel.h>
 #include <sys/syslog.h>
-#include <sys/vimage.h>
 #include <net/bpf.h>
 #include <net/ethernet.h>
 #include <net/if.h>

==== //depot/projects/vimage-commit3/src/sys/netinet/ip_id.c#3 (text+ko) ====

@@ -74,7 +74,6 @@
  * enabled.
  */
 
-
 #include <sys/types.h>
 #include <sys/malloc.h>
 #include <sys/param.h>
@@ -86,7 +85,6 @@
 #include <sys/random.h>
 #include <sys/systm.h>
 #include <sys/sysctl.h>
-#include <sys/vimage.h>
 #include <netinet/in.h>
 #include <netinet/ip_var.h>
 #include <sys/bitstring.h>

==== //depot/projects/vimage-commit3/src/sys/netinet/ip_var.h#2 (text+ko) ====

@@ -34,6 +34,9 @@
 #define	_NETINET_IP_VAR_H_
 
 #include <sys/queue.h>
+#ifdef _KERNEL
+#include <sys/vimage.h>
+#endif
 
 /*
  * Overlay for ip header used by other protocols (tcp, udp).

==== //depot/projects/vimage-commit3/src/sys/netinet/sctp_os_bsd.h#4 (text+ko) ====

@@ -39,6 +39,7 @@
 #include "opt_inet6.h"
 #include "opt_inet.h"
 #include "opt_sctp.h"
+
 #include <sys/param.h>
 #include <sys/ktr.h>
 #include <sys/systm.h>
@@ -60,7 +61,7 @@
 #include <sys/random.h>
 #include <sys/limits.h>
 #include <sys/queue.h>
-#if defined(__FreeBSD__) && __FreeBSD_version > 800000
+#if defined(__FreeBSD__) && __FreeBSD_version >= 800044
 #include <sys/vimage.h>
 #endif
 #include <machine/cpu.h>
@@ -144,8 +145,7 @@
 /*
  * Macros to expand out globals defined by various modules
  * to either a real global or a virtualized instance of one,
- * depending on whether VIMAGE is defined in opt_global.h
- * XXX so will always evaluate to the global for now (VIMAGE not defined)
+ * depending on whether VIMAGE is defined.
  */
 /* first define modules that supply us information */
 #define MOD_NET net
@@ -154,7 +154,7 @@
 #define MOD_IPSEC ipsec
 
 /* then define the macro(s) that hook into the vimage macros */
-#if defined(__FreeBSD__) && __FreeBSD_version > 800000 && defined(VIMAGE)
+#if defined(__FreeBSD__) && __FreeBSD_version >= 800044 && defined(VIMAGE)
 #define VSYMNAME(__MODULE) vnet_ ## __MODULE
 #define MODULE_GLOBAL(__MODULE, __SYMBOL) VSYM(VSYMNAME(__MODULE), __SYMBOL)
 #else

==== //depot/projects/vimage-commit3/src/sys/netinet/tcp_debug.c#3 (text+ko) ====

@@ -57,7 +57,6 @@
 #include <sys/mutex.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
-#include <sys/vimage.h>
 
 #include <netinet/in.h>
 #include <netinet/in_systm.h>

==== //depot/projects/vimage-commit3/src/sys/netinet6/frag6.c#5 (text+ko) ====

@@ -32,7 +32,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/sys/netinet6/frag6.c,v 1.36 2008/07/03 10:55:13 rwatson Exp $");
 
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>

==== //depot/projects/vimage-commit3/src/sys/netinet6/in6_ifattach.c#5 (text+ko) ====

@@ -32,7 +32,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/sys/netinet6/in6_ifattach.c,v 1.43 2008/07/05 13:10:10 rwatson Exp $");
 
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>

==== //depot/projects/vimage-commit3/src/sys/netinet6/in6_rmx.c#6 (text+ko) ====

@@ -75,7 +75,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/sys/netinet6/in6_rmx.c,v 1.23 2008/06/29 04:33:45 kan Exp $");
 
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>

==== //depot/projects/vimage-commit3/src/sys/netinet6/scope6.c#5 (text+ko) ====

@@ -32,7 +32,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/sys/netinet6/scope6.c,v 1.18 2007/12/10 16:03:39 obrien Exp $");
 
-
 #include <sys/param.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>

==== //depot/projects/vimage-commit3/src/sys/netipsec/xform_ah.c#4 (text+ko) ====

@@ -602,11 +602,11 @@
 			hl, (u_long) (authsize + rplen - sizeof (struct ah)),
 			ipsec_address(&sav->sah->saidx.dst),
 			(u_long) ntohl(sav->spi)));
-		ahstat.ahs_badauthl++;
+		V_ahstat.ahs_badauthl++;
 		m_freem(m);
 		return EACCES;
 	}
-	ahstat.ahs_ibytes += m->m_pkthdr.len - skip - hl;
+	V_ahstat.ahs_ibytes += m->m_pkthdr.len - skip - hl;
 
 	/* Get crypto descriptors. */
 	crp = crypto_getreq(1);
@@ -939,7 +939,7 @@
 		    ipsec_address(&sav->sah->saidx.dst),
 		    (u_long) ntohl(sav->spi),
 		    rplen + authsize + m->m_pkthdr.len, maxpacketsize));
-		ahstat.ahs_toobig++;
+		V_ahstat.ahs_toobig++;
 		error = EMSGSIZE;
 		goto bad;
 	}

==== //depot/projects/vimage-commit3/src/sys/netipsec/xform_esp.c#4 (text+ko) ====

@@ -727,7 +727,7 @@
 		    "(len %u, max len %u)\n", __func__,
 		    ipsec_address(&saidx->dst), (u_long) ntohl(sav->spi),
 		    skip + hlen + rlen + padding + alen, maxpacketsize));
-		espstat.esps_toobig++;
+		V_espstat.esps_toobig++;
 		error = EMSGSIZE;
 		goto bad;
 	}

>>> TRUNCATED FOR MAIL (1000 lines) <<<