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/dev/cxgb | |
| 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/dev/cxgb')
| -rw-r--r-- | sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c | 4 | ||||
| -rw-r--r-- | sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c b/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c index 8fd1e97..cf42ea0 100644 --- a/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c +++ b/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c @@ -54,9 +54,7 @@ __FBSDID("$FreeBSD$"); #include <sys/proc.h> #include <sys/eventhandler.h> -#if __FreeBSD_version >= 800044 -#include <sys/vimage.h> -#else +#if __FreeBSD_version < 800044 #define V_ifnet ifnet #endif diff --git a/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c b/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c index 1cbaaff..d528b30 100644 --- a/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c +++ b/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c @@ -48,9 +48,7 @@ __FBSDID("$FreeBSD$"); #include <sys/protosw.h> #include <sys/priv.h> -#if __FreeBSD_version >= 800044 -#include <sys/vimage.h> -#else +#if __FreeBSD_version < 800044 #define V_tcp_do_autosndbuf tcp_do_autosndbuf #define V_tcp_autosndbuf_max tcp_autosndbuf_max #define V_tcp_do_rfc1323 tcp_do_rfc1323 |
