diff options
| author | rwatson <rwatson@FreeBSD.org> | 2009-08-01 19:26:27 +0000 |
|---|---|---|
| committer | rwatson <rwatson@FreeBSD.org> | 2009-08-01 19:26:27 +0000 |
| commit | fb9ffed6504601ed9da2c6b9a620b133c838964c (patch) | |
| tree | 6dc533c8b591922258259a32957fdee2632a29ac /sys/netinet | |
| parent | 2d4b24984c5d2ea2556ae2b1ef1df7f0833dc1b5 (diff) | |
| download | FreeBSD-src-fb9ffed6504601ed9da2c6b9a620b133c838964c.zip FreeBSD-src-fb9ffed6504601ed9da2c6b9a620b133c838964c.tar.gz | |
Merge the remainder of kern_vimage.c and vimage.h into vnet.c and
vnet.h, we now use jails (rather than vimages) as the abstraction
for virtualization management, and what remained was specific to
virtual network stacks. Minor cleanups are done in the process,
and comments updated to reflect these changes.
Reviewed by: bz
Approved by: re (vimage blanket)
Diffstat (limited to 'sys/netinet')
34 files changed, 20 insertions, 34 deletions
diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c index e64b21f..9d1c13a 100644 --- a/sys/netinet/if_ether.c +++ b/sys/netinet/if_ether.c @@ -51,7 +51,6 @@ __FBSDID("$FreeBSD$"); #include <sys/proc.h> #include <sys/socket.h> #include <sys/syslog.h> -#include <sys/vimage.h> #include <net/if.h> #include <net/if_dl.h> @@ -60,6 +59,7 @@ __FBSDID("$FreeBSD$"); #include <net/if_llc.h> #include <net/ethernet.h> #include <net/route.h> +#include <net/vnet.h> #include <netinet/in.h> #include <netinet/in_var.h> diff --git a/sys/netinet/igmp.c b/sys/netinet/igmp.c index 44796de..f9f6381 100644 --- a/sys/netinet/igmp.c +++ b/sys/netinet/igmp.c @@ -59,7 +59,6 @@ __FBSDID("$FreeBSD$"); #include <sys/protosw.h> #include <sys/kernel.h> #include <sys/sysctl.h> -#include <sys/vimage.h> #include <sys/ktr.h> #include <sys/condvar.h> diff --git a/sys/netinet/in.c b/sys/netinet/in.c index 63a712b..15d38b1 100644 --- a/sys/netinet/in.c +++ b/sys/netinet/in.c @@ -46,7 +46,6 @@ __FBSDID("$FreeBSD$"); #include <sys/proc.h> #include <sys/sysctl.h> #include <sys/syslog.h> -#include <sys/vimage.h> #include <net/if.h> #include <net/if_var.h> diff --git a/sys/netinet/in_gif.c b/sys/netinet/in_gif.c index fe2c9ee..3872dde 100644 --- a/sys/netinet/in_gif.c +++ b/sys/netinet/in_gif.c @@ -46,10 +46,10 @@ __FBSDID("$FreeBSD$"); #include <sys/sysctl.h> #include <sys/protosw.h> #include <sys/malloc.h> -#include <sys/vimage.h> #include <net/if.h> #include <net/route.h> +#include <net/vnet.h> #include <netinet/in.h> #include <netinet/in_systm.h> diff --git a/sys/netinet/in_mcast.c b/sys/netinet/in_mcast.c index 6efa7d8..d0e1397 100644 --- a/sys/netinet/in_mcast.c +++ b/sys/netinet/in_mcast.c @@ -45,7 +45,6 @@ __FBSDID("$FreeBSD$"); #include <sys/socketvar.h> #include <sys/protosw.h> #include <sys/sysctl.h> -#include <sys/vimage.h> #include <sys/ktr.h> #include <sys/tree.h> diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index 5d080ba..525afef 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -51,7 +51,6 @@ __FBSDID("$FreeBSD$"); #include <sys/jail.h> #include <sys/kernel.h> #include <sys/sysctl.h> -#include <sys/vimage.h> #ifdef DDB #include <ddb/ddb.h> @@ -62,6 +61,7 @@ __FBSDID("$FreeBSD$"); #include <net/if.h> #include <net/if_types.h> #include <net/route.h> +#include <net/vnet.h> #include <netinet/in.h> #include <netinet/in_pcb.h> diff --git a/sys/netinet/in_proto.c b/sys/netinet/in_proto.c index bf3c713..f1f5ade 100644 --- a/sys/netinet/in_proto.c +++ b/sys/netinet/in_proto.c @@ -50,13 +50,13 @@ __FBSDID("$FreeBSD$"); #include <sys/protosw.h> #include <sys/queue.h> #include <sys/sysctl.h> -#include <sys/vimage.h> #include <net/if.h> #include <net/route.h> #ifdef RADIX_MPATH #include <net/radix_mpath.h> #endif +#include <net/vnet.h> #include <netinet/in.h> #include <netinet/in_systm.h> diff --git a/sys/netinet/in_rmx.c b/sys/netinet/in_rmx.c index d3f9563..6516277 100644 --- a/sys/netinet/in_rmx.c +++ b/sys/netinet/in_rmx.c @@ -51,10 +51,10 @@ __FBSDID("$FreeBSD$"); #include <sys/mbuf.h> #include <sys/syslog.h> #include <sys/callout.h> -#include <sys/vimage.h> #include <net/if.h> #include <net/route.h> +#include <net/vnet.h> #include <netinet/in.h> #include <netinet/in_var.h> diff --git a/sys/netinet/ip_carp.c b/sys/netinet/ip_carp.c index 00c1ea8..18e446f 100644 --- a/sys/netinet/ip_carp.c +++ b/sys/netinet/ip_carp.c @@ -52,7 +52,6 @@ __FBSDID("$FreeBSD$"); #include <sys/socket.h> #include <sys/vnode.h> -#include <sys/vimage.h> #include <machine/stdarg.h> @@ -65,6 +64,7 @@ __FBSDID("$FreeBSD$"); #include <net/if_dl.h> #include <net/if_types.h> #include <net/route.h> +#include <net/vnet.h> #ifdef INET #include <netinet/in.h> diff --git a/sys/netinet/ip_divert.c b/sys/netinet/ip_divert.c index 6abf76f..6910310 100644 --- a/sys/netinet/ip_divert.c +++ b/sys/netinet/ip_divert.c @@ -59,13 +59,13 @@ __FBSDID("$FreeBSD$"); #include <sys/sx.h> #include <sys/sysctl.h> #include <sys/systm.h> -#include <sys/vimage.h> #include <vm/uma.h> #include <net/if.h> #include <net/netisr.h> #include <net/route.h> +#include <net/vnet.h> #include <netinet/in.h> #include <netinet/in_pcb.h> diff --git a/sys/netinet/ip_fastfwd.c b/sys/netinet/ip_fastfwd.c index 1c83706..f53f787 100644 --- a/sys/netinet/ip_fastfwd.c +++ b/sys/netinet/ip_fastfwd.c @@ -87,7 +87,6 @@ __FBSDID("$FreeBSD$"); #include <sys/protosw.h> #include <sys/socket.h> #include <sys/sysctl.h> -#include <sys/vimage.h> #include <net/pfil.h> #include <net/if.h> @@ -95,6 +94,7 @@ __FBSDID("$FreeBSD$"); #include <net/if_var.h> #include <net/if_dl.h> #include <net/route.h> +#include <net/vnet.h> #include <netinet/in.h> #include <netinet/in_systm.h> diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c index 57a1292..b7906e3 100644 --- a/sys/netinet/ip_icmp.c +++ b/sys/netinet/ip_icmp.c @@ -42,7 +42,6 @@ __FBSDID("$FreeBSD$"); #include <sys/time.h> #include <sys/kernel.h> #include <sys/sysctl.h> -#include <sys/vimage.h> #include <net/if.h> #include <net/if_types.h> diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c index f95cf0d..05de6d8 100644 --- a/sys/netinet/ip_input.c +++ b/sys/netinet/ip_input.c @@ -53,7 +53,6 @@ __FBSDID("$FreeBSD$"); #include <sys/rwlock.h> #include <sys/syslog.h> #include <sys/sysctl.h> -#include <sys/vimage.h> #include <net/pfil.h> #include <net/if.h> diff --git a/sys/netinet/ip_ipsec.c b/sys/netinet/ip_ipsec.c index f0d4a5f..0eb4673 100644 --- a/sys/netinet/ip_ipsec.c +++ b/sys/netinet/ip_ipsec.c @@ -43,7 +43,6 @@ __FBSDID("$FreeBSD$"); #include <sys/socket.h> #include <sys/socketvar.h> #include <sys/sysctl.h> -#include <sys/vimage.h> #include <net/if.h> #include <net/route.h> diff --git a/sys/netinet/ip_mroute.c b/sys/netinet/ip_mroute.c index b8957f4..39c71b0 100644 --- a/sys/netinet/ip_mroute.c +++ b/sys/netinet/ip_mroute.c @@ -93,11 +93,11 @@ __FBSDID("$FreeBSD$"); #include <sys/syslog.h> #include <sys/systm.h> #include <sys/time.h> -#include <sys/vimage.h> #include <net/if.h> #include <net/netisr.h> #include <net/route.h> +#include <net/vnet.h> #include <netinet/in.h> #include <netinet/igmp.h> diff --git a/sys/netinet/ip_options.c b/sys/netinet/ip_options.c index 5c4b441..f95b3a0 100644 --- a/sys/netinet/ip_options.c +++ b/sys/netinet/ip_options.c @@ -44,7 +44,6 @@ __FBSDID("$FreeBSD$"); #include <sys/kernel.h> #include <sys/syslog.h> #include <sys/sysctl.h> -#include <sys/vimage.h> #include <net/if.h> #include <net/if_types.h> @@ -52,6 +51,7 @@ __FBSDID("$FreeBSD$"); #include <net/if_dl.h> #include <net/route.h> #include <net/netisr.h> +#include <net/vnet.h> #include <netinet/in.h> #include <netinet/in_systm.h> diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c index 220bf23..bf2a5f8 100644 --- a/sys/netinet/ip_output.c +++ b/sys/netinet/ip_output.c @@ -51,7 +51,6 @@ __FBSDID("$FreeBSD$"); #include <sys/socketvar.h> #include <sys/sysctl.h> #include <sys/ucred.h> -#include <sys/vimage.h> #include <net/if.h> #include <net/netisr.h> diff --git a/sys/netinet/ipfw/ip_fw2.c b/sys/netinet/ipfw/ip_fw2.c index 9274ccd..da6593c 100644 --- a/sys/netinet/ipfw/ip_fw2.c +++ b/sys/netinet/ipfw/ip_fw2.c @@ -63,7 +63,6 @@ __FBSDID("$FreeBSD$"); #include <sys/sysctl.h> #include <sys/syslog.h> #include <sys/ucred.h> -#include <sys/vimage.h> #include <net/ethernet.h> /* for ETHERTYPE_IP */ #include <net/if.h> #include <net/radix.h> diff --git a/sys/netinet/ipfw/ip_fw_nat.c b/sys/netinet/ipfw/ip_fw_nat.c index ac7cc44..cd6a1cf 100644 --- a/sys/netinet/ipfw/ip_fw_nat.c +++ b/sys/netinet/ipfw/ip_fw_nat.c @@ -45,7 +45,6 @@ __FBSDID("$FreeBSD$"); #include <sys/sysctl.h> #include <sys/syslog.h> #include <sys/ucred.h> -#include <sys/vimage.h> #include <netinet/libalias/alias.h> #include <netinet/libalias/alias_local.h> diff --git a/sys/netinet/ipfw/ip_fw_pfil.c b/sys/netinet/ipfw/ip_fw_pfil.c index a763855..e28d5ca 100644 --- a/sys/netinet/ipfw/ip_fw_pfil.c +++ b/sys/netinet/ipfw/ip_fw_pfil.c @@ -49,7 +49,6 @@ __FBSDID("$FreeBSD$"); #include <sys/socketvar.h> #include <sys/sysctl.h> #include <sys/ucred.h> -#include <sys/vimage.h> #include <net/if.h> #include <net/route.h> diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c index 517ac8e..3df2ec3 100644 --- a/sys/netinet/raw_ip.c +++ b/sys/netinet/raw_ip.c @@ -52,7 +52,6 @@ __FBSDID("$FreeBSD$"); #include <sys/sx.h> #include <sys/sysctl.h> #include <sys/systm.h> -#include <sys/vimage.h> #include <vm/uma.h> diff --git a/sys/netinet/sctp_os_bsd.h b/sys/netinet/sctp_os_bsd.h index 46a73bf..f3ccb63 100644 --- a/sys/netinet/sctp_os_bsd.h +++ b/sys/netinet/sctp_os_bsd.h @@ -61,7 +61,6 @@ __FBSDID("$FreeBSD$"); #include <sys/random.h> #include <sys/limits.h> #include <sys/queue.h> -#include <sys/vimage.h> #include <machine/cpu.h> #include <net/if.h> diff --git a/sys/netinet/tcp_hostcache.c b/sys/netinet/tcp_hostcache.c index 2d3d922..acbc860 100644 --- a/sys/netinet/tcp_hostcache.c +++ b/sys/netinet/tcp_hostcache.c @@ -76,10 +76,10 @@ __FBSDID("$FreeBSD$"); #include <sys/socket.h> #include <sys/socketvar.h> #include <sys/sysctl.h> -#include <sys/vimage.h> #include <net/if.h> #include <net/route.h> +#include <net/vnet.h> #include <netinet/in.h> #include <netinet/in_systm.h> diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 2a14d14..22ee3d7 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -50,7 +50,6 @@ __FBSDID("$FreeBSD$"); #include <sys/sysctl.h> #include <sys/syslog.h> #include <sys/systm.h> -#include <sys/vimage.h> #include <machine/cpu.h> /* before tcp_seq.h, for tcp_random18() */ @@ -58,6 +57,7 @@ __FBSDID("$FreeBSD$"); #include <net/if.h> #include <net/route.h> +#include <net/vnet.h> #define TCPSTATES /* for logging */ diff --git a/sys/netinet/tcp_offload.c b/sys/netinet/tcp_offload.c index 94cf570..899a37c 100644 --- a/sys/netinet/tcp_offload.c +++ b/sys/netinet/tcp_offload.c @@ -37,12 +37,12 @@ __FBSDID("$FreeBSD$"); #include <sys/mbuf.h> #include <sys/socket.h> #include <sys/socketvar.h> -#include <sys/vimage.h> #include <net/if.h> #include <net/if_types.h> #include <net/if_var.h> #include <net/route.h> +#include <net/vnet.h> #include <netinet/in.h> #include <netinet/in_systm.h> diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c index c74107e..ee33ea2 100644 --- a/sys/netinet/tcp_output.c +++ b/sys/netinet/tcp_output.c @@ -48,10 +48,10 @@ __FBSDID("$FreeBSD$"); #include <sys/socket.h> #include <sys/socketvar.h> #include <sys/sysctl.h> -#include <sys/vimage.h> #include <net/if.h> #include <net/route.h> +#include <net/vnet.h> #include <netinet/in.h> #include <netinet/in_systm.h> diff --git a/sys/netinet/tcp_reass.c b/sys/netinet/tcp_reass.c index fa844b6..8115b2b 100644 --- a/sys/netinet/tcp_reass.c +++ b/sys/netinet/tcp_reass.c @@ -45,12 +45,12 @@ __FBSDID("$FreeBSD$"); #include <sys/sysctl.h> #include <sys/syslog.h> #include <sys/systm.h> -#include <sys/vimage.h> #include <vm/uma.h> #include <net/if.h> #include <net/route.h> +#include <net/vnet.h> #include <netinet/in.h> #include <netinet/in_pcb.h> diff --git a/sys/netinet/tcp_sack.c b/sys/netinet/tcp_sack.c index 985eee8..06fb502 100644 --- a/sys/netinet/tcp_sack.c +++ b/sys/netinet/tcp_sack.c @@ -89,7 +89,6 @@ __FBSDID("$FreeBSD$"); #include <sys/socketvar.h> #include <sys/syslog.h> #include <sys/systm.h> -#include <sys/vimage.h> #include <machine/cpu.h> /* before tcp_seq.h, for tcp_random18() */ @@ -97,6 +96,7 @@ __FBSDID("$FreeBSD$"); #include <net/if.h> #include <net/route.h> +#include <net/vnet.h> #include <netinet/in.h> #include <netinet/in_systm.h> diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index e29283b..622c508 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -55,12 +55,12 @@ __FBSDID("$FreeBSD$"); #include <sys/socketvar.h> #include <sys/protosw.h> #include <sys/random.h> -#include <sys/vimage.h> #include <vm/uma.h> #include <net/route.h> #include <net/if.h> +#include <net/vnet.h> #include <netinet/in.h> #include <netinet/in_systm.h> diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c index 23e2570..16c4f67 100644 --- a/sys/netinet/tcp_syncache.c +++ b/sys/netinet/tcp_syncache.c @@ -53,7 +53,6 @@ __FBSDID("$FreeBSD$"); #include <sys/socketvar.h> #include <sys/syslog.h> #include <sys/ucred.h> -#include <sys/vimage.h> #include <vm/uma.h> diff --git a/sys/netinet/tcp_timer.c b/sys/netinet/tcp_timer.c index 3050324..7f5d159 100644 --- a/sys/netinet/tcp_timer.c +++ b/sys/netinet/tcp_timer.c @@ -45,10 +45,10 @@ __FBSDID("$FreeBSD$"); #include <sys/socketvar.h> #include <sys/sysctl.h> #include <sys/systm.h> -#include <sys/vimage.h> #include <net/if.h> #include <net/route.h> +#include <net/vnet.h> #include <netinet/in.h> #include <netinet/in_pcb.h> diff --git a/sys/netinet/tcp_timewait.c b/sys/netinet/tcp_timewait.c index a6ac5c6..96626fb 100644 --- a/sys/netinet/tcp_timewait.c +++ b/sys/netinet/tcp_timewait.c @@ -49,12 +49,12 @@ __FBSDID("$FreeBSD$"); #include <sys/socketvar.h> #include <sys/protosw.h> #include <sys/random.h> -#include <sys/vimage.h> #include <vm/uma.h> #include <net/route.h> #include <net/if.h> +#include <net/vnet.h> #include <netinet/in.h> #include <netinet/in_systm.h> diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c index dfd05dc..1e58cd7 100644 --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -53,7 +53,6 @@ __FBSDID("$FreeBSD$"); #include <sys/protosw.h> #include <sys/proc.h> #include <sys/jail.h> -#include <sys/vimage.h> #ifdef DDB #include <ddb/ddb.h> @@ -61,6 +60,7 @@ __FBSDID("$FreeBSD$"); #include <net/if.h> #include <net/route.h> +#include <net/vnet.h> #include <netinet/in.h> #include <netinet/in_systm.h> diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c index 54fb996..520fc94 100644 --- a/sys/netinet/udp_usrreq.c +++ b/sys/netinet/udp_usrreq.c @@ -56,7 +56,6 @@ __FBSDID("$FreeBSD$"); #include <sys/sysctl.h> #include <sys/syslog.h> #include <sys/systm.h> -#include <sys/vimage.h> #include <vm/uma.h> |
