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/contrib | |
| 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/contrib')
| -rw-r--r-- | sys/contrib/altq/altq/altq_subr.c | 3 | ||||
| -rw-r--r-- | sys/contrib/ipfilter/netinet/fil.c | 3 | ||||
| -rw-r--r-- | sys/contrib/ipfilter/netinet/ip_fil_freebsd.c | 1 | ||||
| -rw-r--r-- | sys/contrib/pf/net/pf.c | 1 | ||||
| -rw-r--r-- | sys/contrib/pf/net/pf_if.c | 3 | ||||
| -rw-r--r-- | sys/contrib/pf/net/pf_ioctl.c | 1 | ||||
| -rw-r--r-- | sys/contrib/pf/net/pf_subr.c | 1 | ||||
| -rw-r--r-- | sys/contrib/rdma/rdma_cma.c | 1 |
8 files changed, 0 insertions, 14 deletions
diff --git a/sys/contrib/altq/altq/altq_subr.c b/sys/contrib/altq/altq/altq_subr.c index 348128f..32107e5 100644 --- a/sys/contrib/altq/altq/altq_subr.c +++ b/sys/contrib/altq/altq/altq_subr.c @@ -47,9 +47,6 @@ #include <sys/syslog.h> #include <sys/sysctl.h> #include <sys/queue.h> -#ifdef __FreeBSD__ -#include <sys/vimage.h> -#endif #include <net/if.h> #include <net/if_dl.h> diff --git a/sys/contrib/ipfilter/netinet/fil.c b/sys/contrib/ipfilter/netinet/fil.c index 3cd09d1..ea19254 100644 --- a/sys/contrib/ipfilter/netinet/fil.c +++ b/sys/contrib/ipfilter/netinet/fil.c @@ -33,9 +33,6 @@ # if (__FreeBSD_version == 400019) # define CSUM_DELAY_DATA # endif -# if (__FreeBSD_version >= 800044) -# include <sys/vimage.h> -# endif # endif # include <sys/filio.h> #else diff --git a/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c b/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c index 1480ed0..cac56ef 100644 --- a/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c +++ b/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c @@ -63,7 +63,6 @@ static const char rcsid[] = "@(#)$Id: ip_fil_freebsd.c,v 2.53.2.50 2007/09/20 12 # include <sys/select.h> #endif #if __FreeBSD_version >= 800044 -# include <sys/vimage.h> # include <netinet/tcp_var.h> #else #define V_path_mtu_discovery path_mtu_discovery diff --git a/sys/contrib/pf/net/pf.c b/sys/contrib/pf/net/pf.c index d59930f..79cef36 100644 --- a/sys/contrib/pf/net/pf.c +++ b/sys/contrib/pf/net/pf.c @@ -91,7 +91,6 @@ __FBSDID("$FreeBSD$"); #include <sys/kthread.h> #include <sys/lock.h> #include <sys/sx.h> -#include <sys/vimage.h> #else #include <sys/rwlock.h> #endif diff --git a/sys/contrib/pf/net/pf_if.c b/sys/contrib/pf/net/pf_if.c index 7056640..a78a545 100644 --- a/sys/contrib/pf/net/pf_if.c +++ b/sys/contrib/pf/net/pf_if.c @@ -54,9 +54,6 @@ __FBSDID("$FreeBSD$"); #include <sys/device.h> #endif #include <sys/time.h> -#ifdef __FreeBSD__ -#include <sys/vimage.h> -#endif #include <net/if.h> #include <net/if_types.h> diff --git a/sys/contrib/pf/net/pf_ioctl.c b/sys/contrib/pf/net/pf_ioctl.c index 36331f3..514b7c3 100644 --- a/sys/contrib/pf/net/pf_ioctl.c +++ b/sys/contrib/pf/net/pf_ioctl.c @@ -83,7 +83,6 @@ __FBSDID("$FreeBSD$"); #include <sys/conf.h> #include <sys/proc.h> #include <sys/sysctl.h> -#include <sys/vimage.h> #else #include <sys/timeout.h> #include <sys/pool.h> diff --git a/sys/contrib/pf/net/pf_subr.c b/sys/contrib/pf/net/pf_subr.c index 9314bf1..07f5295 100644 --- a/sys/contrib/pf/net/pf_subr.c +++ b/sys/contrib/pf/net/pf_subr.c @@ -45,7 +45,6 @@ __FBSDID("$FreeBSD$"); #include <sys/socketvar.h> #include <sys/systm.h> #include <sys/time.h> -#include <sys/vimage.h> #include <net/if.h> #include <net/if_types.h> diff --git a/sys/contrib/rdma/rdma_cma.c b/sys/contrib/rdma/rdma_cma.c index 1bf2d08..5352497 100644 --- a/sys/contrib/rdma/rdma_cma.c +++ b/sys/contrib/rdma/rdma_cma.c @@ -46,7 +46,6 @@ __FBSDID("$FreeBSD$"); #include <sys/taskqueue.h> #include <sys/priv.h> #include <sys/syslog.h> -#include <sys/vimage.h> #include <net/if.h> #include <netinet/in.h> |
