Date: Wed, 8 Oct 2008 15:24:45 GMT From: Marko Zec <zec@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 151137 for review Message-ID: <200810081524.m98FOjPx050955@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=151137 Change 151137 by zec@zec_tca51 on 2008/10/08 15:23:48 unbreak the build by hiding a few issues under the rug... remove a few unnecessary #includes. Affected files ... .. //depot/projects/vimage/src/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c#2 edit .. //depot/projects/vimage/src/sys/net/bpf.c#27 edit .. //depot/projects/vimage/src/sys/net/bridgestp.c#15 edit .. //depot/projects/vimage/src/sys/net/if.c#42 edit .. //depot/projects/vimage/src/sys/net/if_bridge.c#20 edit .. //depot/projects/vimage/src/sys/net/if_clone.c#11 edit .. //depot/projects/vimage/src/sys/net/if_ef.c#9 edit .. //depot/projects/vimage/src/sys/net/if_ethersubr.c#27 edit .. //depot/projects/vimage/src/sys/net/if_loop.c#27 edit .. //depot/projects/vimage/src/sys/net/if_mib.c#10 edit .. //depot/projects/vimage/src/sys/net/if_spppsubr.c#11 edit .. //depot/projects/vimage/src/sys/net/if_stf.c#14 edit .. //depot/projects/vimage/src/sys/net/if_tap.c#9 edit .. //depot/projects/vimage/src/sys/net/if_vlan.c#13 edit .. //depot/projects/vimage/src/sys/net/netisr.c#11 edit .. //depot/projects/vimage/src/sys/net/route.c#29 edit .. //depot/projects/vimage/src/sys/net/rtsock.c#18 edit .. //depot/projects/vimage/src/sys/netinet/if_ether.c#25 edit .. //depot/projects/vimage/src/sys/netinet/igmp.c#19 edit .. //depot/projects/vimage/src/sys/netinet/in.c#18 edit .. //depot/projects/vimage/src/sys/netinet/in_mcast.c#13 edit .. //depot/projects/vimage/src/sys/netinet/in_pcb.c#34 edit .. //depot/projects/vimage/src/sys/netinet/in_rmx.c#22 edit .. //depot/projects/vimage/src/sys/netinet/ip_divert.c#16 edit .. //depot/projects/vimage/src/sys/netinet/ip_fastfwd.c#14 edit .. //depot/projects/vimage/src/sys/netinet/ip_fw2.c#49 edit .. //depot/projects/vimage/src/sys/netinet/ip_fw_nat.c#9 edit .. //depot/projects/vimage/src/sys/netinet/ip_icmp.c#20 edit .. //depot/projects/vimage/src/sys/netinet/ip_input.c#37 edit .. //depot/projects/vimage/src/sys/netinet/ip_options.c#16 edit .. //depot/projects/vimage/src/sys/netinet/ip_output.c#19 edit .. //depot/projects/vimage/src/sys/netinet/raw_ip.c#29 edit .. //depot/projects/vimage/src/sys/netinet/tcp_hostcache.c#27 edit .. //depot/projects/vimage/src/sys/netinet/tcp_input.c#38 edit .. //depot/projects/vimage/src/sys/netinet/tcp_output.c#25 edit .. //depot/projects/vimage/src/sys/netinet/tcp_sack.c#13 edit .. //depot/projects/vimage/src/sys/netinet/tcp_subr.c#53 edit .. //depot/projects/vimage/src/sys/netinet/tcp_syncache.c#42 edit .. //depot/projects/vimage/src/sys/netinet/tcp_timer.c#23 edit .. //depot/projects/vimage/src/sys/netinet/tcp_usrreq.c#25 edit .. //depot/projects/vimage/src/sys/netinet/udp_usrreq.c#35 edit .. //depot/projects/vimage/src/sys/netinet/vinet.h#31 edit .. //depot/projects/vimage/src/sys/netinet6/icmp6.c#31 edit .. //depot/projects/vimage/src/sys/netinet6/in6.c#23 edit .. //depot/projects/vimage/src/sys/netinet6/in6_cksum.c#6 edit .. //depot/projects/vimage/src/sys/netinet6/in6_ifattach.c#26 edit .. //depot/projects/vimage/src/sys/netinet6/in6_pcb.c#23 edit .. //depot/projects/vimage/src/sys/netinet6/in6_rmx.c#22 edit .. //depot/projects/vimage/src/sys/netinet6/in6_src.c#24 edit .. //depot/projects/vimage/src/sys/netinet6/ip6_input.c#36 edit .. //depot/projects/vimage/src/sys/netinet6/ip6_mroute.c#18 edit .. //depot/projects/vimage/src/sys/netinet6/ip6_output.c#21 edit .. //depot/projects/vimage/src/sys/netinet6/mld6.c#17 edit .. //depot/projects/vimage/src/sys/netinet6/nd6.c#33 edit .. //depot/projects/vimage/src/sys/netinet6/nd6_nbr.c#22 edit .. //depot/projects/vimage/src/sys/netinet6/nd6_rtr.c#20 edit .. //depot/projects/vimage/src/sys/netinet6/raw_ip6.c#26 edit .. //depot/projects/vimage/src/sys/netinet6/scope6.c#18 edit .. //depot/projects/vimage/src/sys/netinet6/udp6_usrreq.c#31 edit .. //depot/projects/vimage/src/sys/netipsec/ipsec.c#28 edit .. //depot/projects/vimage/src/sys/netipsec/key.c#24 edit .. //depot/projects/vimage/src/sys/netipsec/keysock.c#15 edit .. //depot/projects/vimage/src/sys/netipsec/xform_ipip.c#18 edit .. //depot/projects/vimage/src/sys/sys/vimage.h#67 edit Differences ... ==== //depot/projects/vimage/src/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c#2 (text+ko) ==== @@ -36,7 +36,11 @@ char hw_serial[11] = "0"; struct opensolaris_utsname utsname = { +#ifdef VIMAGE + .nodename = "XXX" /* XXX FIXME!!! */ +#else .nodename = hostname +#endif }; int ==== //depot/projects/vimage/src/sys/net/bpf.c#27 (text+ko) ==== @@ -61,11 +61,9 @@ #include <sys/file.h> #include <sys/poll.h> #include <sys/proc.h> -#include <sys/vimage.h> #include <sys/socket.h> -#include <net/vnet.h> #include <net/if.h> #include <net/bpf.h> #include <net/bpf_buffer.h> ==== //depot/projects/vimage/src/sys/net/bridgestp.c#15 (text+ko) ==== @@ -49,14 +49,12 @@ #include <sys/lock.h> #include <sys/mutex.h> #include <sys/taskqueue.h> -#include <sys/vimage.h> #include <net/if.h> #include <net/if_dl.h> #include <net/if_types.h> #include <net/if_llc.h> #include <net/if_media.h> -#include <net/vnet.h> #include <netinet/in.h> #include <netinet/in_systm.h> ==== //depot/projects/vimage/src/sys/net/if.c#42 (text+ko) ==== @@ -56,11 +56,9 @@ #include <sys/taskqueue.h> #include <sys/domain.h> #include <sys/jail.h> -#include <sys/vimage.h> #include <machine/stdarg.h> -#include <net/vnet.h> #include <net/if.h> #include <net/if_clone.h> #include <net/if_dl.h> @@ -211,7 +209,6 @@ struct ifaddr * ifaddr_byindex(u_short idx) { - INIT_VNET_NET(curvnet); struct ifaddr *ifa; IFNET_RLOCK(); ==== //depot/projects/vimage/src/sys/net/if_bridge.c#20 (text+ko) ==== @@ -100,7 +100,6 @@ #include <sys/proc.h> #include <sys/lock.h> #include <sys/mutex.h> -#include <sys/vimage.h> #include <net/bpf.h> #include <net/if.h> @@ -119,7 +118,6 @@ #ifdef INET6 #include <netinet/ip6.h> #include <netinet6/ip6_var.h> -#include <netinet6/vinet6.h> #endif #ifdef DEV_CARP #include <netinet/ip_carp.h> @@ -130,12 +128,10 @@ #include <net/if_bridgevar.h> #include <net/if_llc.h> #include <net/if_vlan_var.h> -#include <net/vnet.h> #include <net/route.h> #include <netinet/ip_fw.h> #include <netinet/ip_dummynet.h> -#include <netinet/vinet.h> /* * Size of the route hash table. Must be a power of two. @@ -3380,7 +3376,6 @@ bridge_fragment(struct ifnet *ifp, struct mbuf *m, struct ether_header *eh, int snap, struct llc *llc) { - INIT_VNET_INET(curvnet); struct mbuf *m0; struct ip *ip; int error = -1; ==== //depot/projects/vimage/src/sys/net/if_clone.c#11 (text+ko) ==== @@ -41,7 +41,6 @@ #include <sys/socket.h> #include <sys/vimage.h> -#include <net/vnet.h> #include <net/if.h> #include <net/if_clone.h> #if 0 ==== //depot/projects/vimage/src/sys/net/if_ef.c#9 (text+ko) ==== @@ -39,7 +39,6 @@ #include <sys/syslog.h> #include <sys/kernel.h> #include <sys/module.h> -#include <sys/vimage.h> #include <net/ethernet.h> #include <net/if_llc.h> @@ -50,7 +49,6 @@ #include <net/netisr.h> #include <net/route.h> #include <net/bpf.h> -#include <net/vnet.h> #ifdef INET #include <netinet/in.h> ==== //depot/projects/vimage/src/sys/net/if_ethersubr.c#27 (text+ko) ==== @@ -51,9 +51,7 @@ #include <sys/socket.h> #include <sys/sockio.h> #include <sys/sysctl.h> -#include <sys/vimage.h> -#include <net/vnet.h> #include <net/if.h> #include <net/if_arp.h> #include <net/netisr.h> ==== //depot/projects/vimage/src/sys/net/if_loop.c#27 (text+ko) ==== @@ -52,7 +52,6 @@ #include <sys/sysctl.h> #include <sys/vimage.h> -#include <net/vnet.h> #include <net/if.h> #include <net/if_clone.h> #include <net/if_types.h> ==== //depot/projects/vimage/src/sys/net/if_mib.c#10 (text+ko) ==== @@ -36,7 +36,6 @@ #include <sys/sysctl.h> #include <sys/vimage.h> -#include <net/vnet.h> #include <net/if.h> #include <net/if_mib.h> ==== //depot/projects/vimage/src/sys/net/if_spppsubr.c#11 (text+ko) ==== @@ -40,13 +40,11 @@ #include <sys/md5.h> -#include <net/vnet.h> #include <net/if.h> #include <net/netisr.h> #include <net/if_types.h> #include <net/route.h> -#include <netinet/vinet.h> #include <netinet/in.h> #include <netinet/in_systm.h> #include <netinet/ip.h> ==== //depot/projects/vimage/src/sys/net/if_stf.c#14 (text+ko) ==== @@ -95,7 +95,6 @@ #include <sys/malloc.h> #include <sys/vimage.h> -#include <net/vnet.h> #include <net/if.h> #include <net/if_clone.h> #include <net/route.h> @@ -103,7 +102,6 @@ #include <net/if_types.h> #include <net/if_stf.h> -#include <netinet/vinet.h> #include <netinet/in.h> #include <netinet/in_systm.h> #include <netinet/ip.h> ==== //depot/projects/vimage/src/sys/net/if_tap.c#9 (text+ko) ==== @@ -60,7 +60,6 @@ #include <sys/queue.h> #include <sys/vimage.h> -#include <net/vnet.h> #include <net/bpf.h> #include <net/ethernet.h> #include <net/if.h> ==== //depot/projects/vimage/src/sys/net/if_vlan.c#13 (text+ko) ==== @@ -57,7 +57,6 @@ #include <sys/systm.h> #include <sys/vimage.h> -#include <net/vnet.h> #include <net/bpf.h> #include <net/ethernet.h> #include <net/if.h> ==== //depot/projects/vimage/src/sys/net/netisr.c#11 (text+ko) ==== @@ -51,7 +51,6 @@ #include <sys/socket.h> #include <sys/vimage.h> -#include <net/vnet.h> #include <net/if.h> #include <net/if_types.h> #include <net/if_var.h> ==== //depot/projects/vimage/src/sys/net/route.c#29 (text+ko) ==== @@ -51,7 +51,6 @@ #include <sys/kernel.h> #include <sys/vimage.h> -#include <net/vnet.h> #include <net/if.h> #include <net/route.h> ==== //depot/projects/vimage/src/sys/net/rtsock.c#18 (text+ko) ==== @@ -48,7 +48,6 @@ #include <sys/systm.h> #include <sys/vimage.h> -#include <net/vnet.h> #include <net/if.h> #include <net/netisr.h> #include <net/raw_cb.h> ==== //depot/projects/vimage/src/sys/netinet/if_ether.c#25 (text+ko) ==== @@ -54,7 +54,6 @@ #include <sys/syslog.h> #include <sys/vimage.h> -#include <net/vnet.h> #include <net/if.h> #include <net/if_dl.h> #include <net/if_types.h> @@ -63,7 +62,6 @@ #include <net/if_llc.h> #include <net/ethernet.h> -#include <netinet/vinet.h> #include <netinet/in.h> #include <netinet/in_var.h> #include <netinet/if_ether.h> ==== //depot/projects/vimage/src/sys/netinet/igmp.c#19 (text+ko) ==== @@ -59,11 +59,9 @@ #include <sys/sysctl.h> #include <sys/vimage.h> -#include <net/vnet.h> #include <net/if.h> #include <net/route.h> -#include <netinet/vinet.h> #include <netinet/in.h> #include <netinet/in_var.h> #include <netinet/in_systm.h> ==== //depot/projects/vimage/src/sys/netinet/in.c#18 (text+ko) ==== @@ -45,12 +45,10 @@ #include <sys/sysctl.h> #include <sys/vimage.h> -#include <net/vnet.h> #include <net/if.h> #include <net/if_types.h> #include <net/route.h> -#include <netinet/vinet.h> #include <netinet/in.h> #include <netinet/in_var.h> #include <netinet/in_pcb.h> ==== //depot/projects/vimage/src/sys/netinet/in_mcast.c#13 (text+ko) ==== @@ -53,9 +53,7 @@ #include <net/if.h> #include <net/if_dl.h> #include <net/route.h> -#include <net/vnet.h> -#include <netinet/vinet.h> #include <netinet/in.h> #include <netinet/in_systm.h> #include <netinet/in_pcb.h> ==== //depot/projects/vimage/src/sys/netinet/in_pcb.c#34 (text+ko) ==== @@ -60,12 +60,10 @@ #include <vm/uma.h> -#include <net/vnet.h> #include <net/if.h> #include <net/if_types.h> #include <net/route.h> -#include <netinet/vinet.h> #include <netinet/in.h> #include <netinet/in_pcb.h> #include <netinet/in_var.h> @@ -77,7 +75,6 @@ #include <netinet/ip6.h> #include <netinet6/ip6_var.h> #endif /* INET6 */ -#include <netinet6/vinet6.h> #ifdef IPSEC #include <netipsec/ipsec.h> ==== //depot/projects/vimage/src/sys/netinet/in_rmx.c#22 (text+ko) ==== @@ -53,10 +53,8 @@ #include <sys/callout.h> #include <sys/vimage.h> -#include <net/vnet.h> #include <net/if.h> #include <net/route.h> -#include <netinet/vinet.h> #include <netinet/in.h> #include <netinet/in_var.h> #include <netinet/ip_var.h> ==== //depot/projects/vimage/src/sys/netinet/ip_divert.c#16 (text+ko) ==== @@ -62,12 +62,10 @@ #include <vm/uma.h> -#include <net/vnet.h> #include <net/if.h> #include <net/netisr.h> #include <net/route.h> -#include <netinet/vinet.h> #include <netinet/in.h> #include <netinet/in_pcb.h> #include <netinet/in_systm.h> ==== //depot/projects/vimage/src/sys/netinet/ip_fastfwd.c#14 (text+ko) ==== @@ -89,7 +89,6 @@ #include <sys/sysctl.h> #include <sys/vimage.h> -#include <net/vnet.h> #include <net/pfil.h> #include <net/if.h> #include <net/if_types.h> @@ -97,7 +96,6 @@ #include <net/if_dl.h> #include <net/route.h> -#include <netinet/vinet.h> #include <netinet/in.h> #include <netinet/in_systm.h> #include <netinet/in_var.h> ==== //depot/projects/vimage/src/sys/netinet/ip_fw2.c#49 (text+ko) ==== @@ -66,7 +66,6 @@ #include <sys/ucred.h> #include <sys/vimage.h> -#include <net/vnet.h> #include <net/if.h> #include <net/radix.h> #include <net/route.h> @@ -93,7 +92,6 @@ #include <netinet/udp.h> #include <netinet/udp_var.h> #include <netinet/sctp.h> -#include <netinet/vinet.h> #include <netgraph/ng_ipfw.h> #include <altq/if_altq.h> ==== //depot/projects/vimage/src/sys/netinet/ip_fw_nat.c#9 (text+ko) ==== @@ -53,7 +53,6 @@ #define IPFW_INTERNAL /* Access to protected data structures in ip_fw.h. */ #include <net/if.h> -#include <net/vnet.h> #include <netinet/in.h> #include <netinet/ip.h> #include <netinet/ip_var.h> @@ -65,7 +64,6 @@ #include <netinet/tcpip.h> #include <netinet/udp.h> #include <netinet/udp_var.h> -#include <netinet/vinet.h> #include <machine/in_cksum.h> /* XXX for in_cksum */ ==== //depot/projects/vimage/src/sys/netinet/ip_icmp.c#20 (text+ko) ==== @@ -129,8 +129,6 @@ /* * ICMP broadcast echo sysctl */ - -static int icmpbmcastecho = 0; SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_icmp, OID_AUTO, bmcastecho, CTLFLAG_RW, icmpbmcastecho, 0, ""); ==== //depot/projects/vimage/src/sys/netinet/ip_input.c#37 (text+ko) ==== @@ -53,7 +53,6 @@ #include <sys/sysctl.h> #include <sys/vimage.h> -#include <net/vnet.h> #include <net/pfil.h> #include <net/if.h> #include <net/if_types.h> @@ -62,7 +61,6 @@ #include <net/route.h> #include <net/netisr.h> -#include <netinet/vinet.h> #include <netinet/in.h> #include <netinet/in_systm.h> #include <netinet/in_var.h> ==== //depot/projects/vimage/src/sys/netinet/ip_options.c#16 (text+ko) ==== @@ -47,7 +47,6 @@ #include <sys/sysctl.h> #include <sys/vimage.h> -#include <net/vnet.h> #include <net/if.h> #include <net/if_types.h> #include <net/if_var.h> @@ -55,7 +54,6 @@ #include <net/route.h> #include <net/netisr.h> -#include <netinet/vinet.h> #include <netinet/in.h> #include <netinet/in_systm.h> #include <netinet/in_var.h> ==== //depot/projects/vimage/src/sys/netinet/ip_output.c#19 (text+ko) ==== @@ -52,7 +52,6 @@ #include <sys/ucred.h> #include <sys/vimage.h> -#include <net/vnet.h> #include <net/if.h> #include <net/netisr.h> #include <net/pfil.h> @@ -61,7 +60,6 @@ #include <net/radix_mpath.h> #endif -#include <netinet/vinet.h> #include <netinet/in.h> #include <netinet/in_systm.h> #include <netinet/ip.h> ==== //depot/projects/vimage/src/sys/netinet/raw_ip.c#29 (text+ko) ==== @@ -56,11 +56,9 @@ #include <vm/uma.h> -#include <net/vnet.h> #include <net/if.h> #include <net/route.h> -#include <netinet/vinet.h> #include <netinet/in.h> #include <netinet/in_systm.h> #include <netinet/in_pcb.h> ==== //depot/projects/vimage/src/sys/netinet/tcp_hostcache.c#27 (text+ko) ==== @@ -73,10 +73,8 @@ #include <sys/sysctl.h> #include <sys/vimage.h> -#include <net/vnet.h> #include <net/if.h> -#include <netinet/vinet.h> #include <netinet/in.h> #include <netinet/in_systm.h> #include <netinet/ip.h> ==== //depot/projects/vimage/src/sys/netinet/tcp_input.c#38 (text+ko) ==== @@ -57,13 +57,11 @@ #include <vm/uma.h> -#include <net/vnet.h> #include <net/if.h> #include <net/route.h> #define TCPSTATES /* for logging */ -#include <netinet/vinet.h> #include <netinet/in.h> #include <netinet/in_pcb.h> #include <netinet/in_systm.h> @@ -75,7 +73,6 @@ #include <netinet/ip_options.h> #include <netinet/ip6.h> #include <netinet/icmp6.h> -#include <netinet6/vinet6.h> #include <netinet6/in6_pcb.h> #include <netinet6/ip6_var.h> #include <netinet6/nd6.h> @@ -94,7 +91,6 @@ #ifdef IPSEC #include <netipsec/ipsec.h> #include <netipsec/ipsec6.h> -#include <netipsec/vipsec.h> #endif /*IPSEC*/ #include <machine/in_cksum.h> ==== //depot/projects/vimage/src/sys/netinet/tcp_output.c#25 (text+ko) ==== @@ -51,10 +51,8 @@ #include <sys/sysctl.h> #include <sys/vimage.h> -#include <net/vnet.h> #include <net/route.h> -#include <netinet/vinet.h> #include <netinet/in.h> #include <netinet/in_systm.h> #include <netinet/ip.h> ==== //depot/projects/vimage/src/sys/netinet/tcp_sack.c#13 (text+ko) ==== @@ -95,11 +95,9 @@ #include <vm/uma.h> -#include <net/vnet.h> #include <net/if.h> #include <net/route.h> -#include <netinet/vinet.h> #include <netinet/in.h> #include <netinet/in_systm.h> #include <netinet/ip.h> ==== //depot/projects/vimage/src/sys/netinet/tcp_subr.c#53 (text+ko) ==== @@ -59,11 +59,9 @@ #include <vm/uma.h> -#include <net/vnet.h> #include <net/route.h> #include <net/if.h> -#include <netinet/vinet.h> #include <netinet/in.h> #include <netinet/in_systm.h> #include <netinet/ip.h> @@ -97,7 +95,6 @@ #include <netinet/tcp_debug.h> #endif #include <netinet6/ip6protosw.h> -#include <netinet6/vinet6.h> #ifdef IPSEC #include <netipsec/ipsec.h> ==== //depot/projects/vimage/src/sys/netinet/tcp_syncache.c#42 (text+ko) ==== @@ -58,11 +58,9 @@ #include <vm/uma.h> -#include <net/vnet.h> #include <net/if.h> #include <net/route.h> -#include <netinet/vinet.h> #include <netinet/in.h> #include <netinet/in_systm.h> #include <netinet/ip.h> @@ -376,7 +374,6 @@ syncache_timer(void *xsch) { struct syncache_head *sch = (struct syncache_head *)xsch; - INIT_VNET_INET(sch->sch_vnet); struct syncache *sc, *nsc; int tick = ticks; char *s; ==== //depot/projects/vimage/src/sys/netinet/tcp_timer.c#23 (text+ko) ==== @@ -47,10 +47,8 @@ #include <sys/systm.h> #include <sys/vimage.h> -#include <net/vnet.h> #include <net/route.h> -#include <netinet/vinet.h> #include <netinet/in.h> #include <netinet/in_pcb.h> #include <netinet/in_systm.h> ==== //depot/projects/vimage/src/sys/netinet/tcp_usrreq.c#25 (text+ko) ==== @@ -59,11 +59,9 @@ #include <ddb/ddb.h> #endif -#include <net/vnet.h> #include <net/if.h> #include <net/route.h> -#include <netinet/vinet.h> #include <netinet/in.h> #include <netinet/in_systm.h> #ifdef INET6 ==== //depot/projects/vimage/src/sys/netinet/udp_usrreq.c#35 (text+ko) ==== @@ -61,11 +61,9 @@ #include <vm/uma.h> -#include <net/vnet.h> #include <net/if.h> #include <net/route.h> -#include <netinet/vinet.h> #include <netinet/in.h> #include <netinet/in_pcb.h> #include <netinet/in_systm.h> @@ -86,7 +84,6 @@ #ifdef IPSEC #include <netipsec/ipsec.h> -#include <netipsec/vipsec.h> #endif #include <machine/in_cksum.h> ==== //depot/projects/vimage/src/sys/netinet/vinet.h#31 (text+ko) ==== ==== //depot/projects/vimage/src/sys/netinet6/icmp6.c#31 (text+ko) ==== @@ -83,20 +83,17 @@ #include <sys/time.h> #include <sys/vimage.h> -#include <net/vnet.h> #include <net/if.h> #include <net/if_dl.h> #include <net/if_types.h> #include <net/route.h> -#include <netinet/vinet.h> #include <netinet/in.h> #include <netinet/in_pcb.h> #include <netinet/in_var.h> #include <netinet/ip6.h> #include <netinet/icmp6.h> #include <netinet/tcp_var.h> -#include <netinet6/vinet6.h> #include <netinet6/in6_ifattach.h> #include <netinet6/in6_pcb.h> #include <netinet6/ip6protosw.h> ==== //depot/projects/vimage/src/sys/netinet6/in6.c#23 (text+ko) ==== @@ -80,7 +80,6 @@ #include <sys/syslog.h> #include <sys/vimage.h> -#include <net/vnet.h> #include <net/if.h> #include <net/if_types.h> #include <net/route.h> @@ -94,7 +93,6 @@ #include <netinet/in_pcb.h> #include <netinet/ip6.h> -#include <netinet6/vinet6.h> #include <netinet6/ip6_var.h> #include <netinet6/nd6.h> #include <netinet6/mld6_var.h> ==== //depot/projects/vimage/src/sys/netinet6/in6_cksum.c#6 (text+ko) ==== @@ -67,8 +67,6 @@ #include <sys/mbuf.h> #include <sys/systm.h> -#include <net/vnet.h> - #include <netinet/in.h> #include <netinet/ip6.h> #include <netinet6/scope6_var.h> ==== //depot/projects/vimage/src/sys/netinet6/in6_ifattach.c#26 (text+ko) ==== @@ -42,20 +42,17 @@ #include <sys/md5.h> #include <sys/vimage.h> -#include <net/vnet.h> #include <net/if.h> #include <net/if_dl.h> #include <net/if_types.h> #include <net/route.h> -#include <netinet/vinet.h> #include <netinet/in.h> #include <netinet/in_var.h> #include <netinet/if_ether.h> #include <netinet/in_pcb.h> #include <netinet/ip6.h> -#include <netinet6/vinet6.h> #include <netinet6/ip6_var.h> #include <netinet6/in6_var.h> #include <netinet6/in6_pcb.h> ==== //depot/projects/vimage/src/sys/netinet6/in6_pcb.c#23 (text+ko) ==== @@ -86,12 +86,10 @@ #include <vm/uma.h> -#include <net/vnet.h> #include <net/if.h> #include <net/if_types.h> #include <net/route.h> -#include <netinet/vinet.h> #include <netinet/in.h> #include <netinet/in_var.h> #include <netinet/in_systm.h> @@ -99,7 +97,6 @@ #include <netinet/ip6.h> #include <netinet/ip_var.h> -#include <netinet6/vinet6.h> #include <netinet6/ip6_var.h> #include <netinet6/nd6.h> #include <netinet/in_pcb.h> ==== //depot/projects/vimage/src/sys/netinet6/in6_rmx.c#22 (text+ko) ==== @@ -87,15 +87,12 @@ #include <sys/callout.h> #include <sys/vimage.h> -#include <net/vnet.h> #include <net/if.h> #include <net/route.h> #include <netinet/in.h> #include <netinet/ip_var.h> #include <netinet/in_var.h> -#include <netinet6/vinet6.h> - #include <netinet/ip6.h> #include <netinet6/ip6_var.h> ==== //depot/projects/vimage/src/sys/netinet6/in6_src.c#24 (text+ko) ==== @@ -84,21 +84,18 @@ #include <sys/sx.h> #include <sys/vimage.h> -#include <net/vnet.h> #include <net/if.h> #include <net/route.h> #ifdef RADIX_MPATH #include <net/radix_mpath.h> #endif -#include <netinet/vinet.h> #include <netinet/in.h> #include <netinet/in_var.h> #include <netinet/in_systm.h> #include <netinet/ip.h> #include <netinet/in_pcb.h> -#include <netinet6/vinet6.h> #include <netinet6/in6_var.h> #include <netinet/ip6.h> #include <netinet6/in6_pcb.h> @@ -463,7 +460,6 @@ struct ifnet **retifp, struct rtentry **retrt, int clone, int norouteok) { - INIT_VNET_NET(curvnet); INIT_VNET_INET6(curvnet); int error = 0; struct ifnet *ifp = NULL; ==== //depot/projects/vimage/src/sys/netinet6/ip6_input.c#36 (text+ko) ==== @@ -82,7 +82,6 @@ #include <sys/syslog.h> #include <sys/vimage.h> -#include <net/vnet.h> #include <net/if.h> #include <net/if_types.h> #include <net/if_dl.h> @@ -104,7 +103,6 @@ #include <netinet/in_pcb.h> #include <netinet/icmp6.h> -#include <netinet6/vinet6.h> #include <netinet6/scope6_var.h> #include <netinet6/in6_ifattach.h> #include <netinet6/nd6.h> ==== //depot/projects/vimage/src/sys/netinet6/ip6_mroute.c#18 (text+ko) ==== @@ -103,7 +103,6 @@ #include <sys/time.h> #include <sys/vimage.h> -#include <net/vnet.h> #include <net/if.h> #include <net/if_types.h> #include <net/raw_cb.h> @@ -114,7 +113,6 @@ #include <netinet/icmp6.h> #include <netinet/ip6.h> -#include <netinet6/vinet6.h> #include <netinet6/ip6_var.h> #include <netinet6/scope6_var.h> #include <netinet6/nd6.h> ==== //depot/projects/vimage/src/sys/netinet6/ip6_output.c#21 (text+ko) ==== @@ -80,7 +80,6 @@ #include <sys/ucred.h> #include <sys/vimage.h> -#include <net/vnet.h> #include <net/if.h> #include <net/netisr.h> #include <net/route.h> @@ -88,7 +87,6 @@ #include <netinet/in.h> #include <netinet/in_var.h> -#include <netinet6/vinet6.h> #include <netinet6/in6_var.h> #include <netinet/ip6.h> #include <netinet/icmp6.h> ==== //depot/projects/vimage/src/sys/netinet6/mld6.c#17 (text+ko) ==== @@ -81,12 +81,10 @@ #include <sys/malloc.h> #include <sys/vimage.h> -#include <net/vnet.h> #include <net/if.h> #include <netinet/in.h> #include <netinet/in_var.h> >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200810081524.m98FOjPx050955>