diff options
| author | zec <zec@FreeBSD.org> | 2008-11-28 23:30:51 +0000 |
|---|---|---|
| committer | zec <zec@FreeBSD.org> | 2008-11-28 23:30:51 +0000 |
| commit | 7ecd715d484a68ba07dae8dcb30670d691129c07 (patch) | |
| tree | bb923196c85b9e71d363a7650c292edddfbc6beb /sys/netipsec | |
| parent | d8aff71262b6224530a865344e20823189bd5cb1 (diff) | |
| download | FreeBSD-src-7ecd715d484a68ba07dae8dcb30670d691129c07.zip FreeBSD-src-7ecd715d484a68ba07dae8dcb30670d691129c07.tar.gz | |
Unhide declarations of network stack virtualization structs from
underneath #ifdef VIMAGE blocks.
This change introduces some churn in #include ordering and nesting
throughout the network stack and drivers but is not expected to cause
any additional issues.
In the next step this will allow us to instantiate the virtualization
container structures and switch from using global variables to their
"containerized" counterparts.
Reviewed by: bz, julian
Approved by: julian (mentor)
Obtained from: //depot/projects/vimage-commit2/...
X-MFC after: never
Sponsored by: NLnet Foundation, The FreeBSD Foundation
Diffstat (limited to 'sys/netipsec')
| -rw-r--r-- | sys/netipsec/keysock.c | 5 | ||||
| -rw-r--r-- | sys/netipsec/keysock.h | 5 | ||||
| -rw-r--r-- | sys/netipsec/vipsec.h | 2 |
3 files changed, 5 insertions, 7 deletions
diff --git a/sys/netipsec/keysock.c b/sys/netipsec/keysock.c index ace6993..6842b5f 100644 --- a/sys/netipsec/keysock.c +++ b/sys/netipsec/keysock.c @@ -66,11 +66,6 @@ #include <machine/stdarg.h> -struct key_cb { - int key_count; - int any_count; -}; - #ifdef VIMAGE_GLOBALS static struct key_cb key_cb; struct pfkeystat pfkeystat; diff --git a/sys/netipsec/keysock.h b/sys/netipsec/keysock.h index a331b5e..1097206 100644 --- a/sys/netipsec/keysock.h +++ b/sys/netipsec/keysock.h @@ -58,6 +58,11 @@ struct pfkeystat { u_quad_t sockerr; /* # of socket related errors */ }; +struct key_cb { + int key_count; + int any_count; +}; + #define KEY_SENDUP_ONE 0 #define KEY_SENDUP_ALL 1 #define KEY_SENDUP_REGISTERED 2 diff --git a/sys/netipsec/vipsec.h b/sys/netipsec/vipsec.h index 2f5acf7..32818b9 100644 --- a/sys/netipsec/vipsec.h +++ b/sys/netipsec/vipsec.h @@ -33,7 +33,6 @@ #ifndef _NETIPSEC_VIPSEC_H_ #define _NETIPSEC_VIPSEC_H_ -#ifdef VIMAGE #include <sys/proc.h> #include <sys/protosw.h> #include <sys/socket.h> @@ -112,7 +111,6 @@ struct vnet_ipsec { LIST_HEAD(, secacq) _acqtree; LIST_HEAD(, secspacq) _spacqtree; }; -#endif /* * Symbol translation macros |
