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/netinet6 | |
| 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/netinet6')
| -rw-r--r-- | sys/netinet6/in6_ifattach.c | 1 | ||||
| -rw-r--r-- | sys/netinet6/vinet6.h | 4 |
2 files changed, 0 insertions, 5 deletions
diff --git a/sys/netinet6/in6_ifattach.c b/sys/netinet6/in6_ifattach.c index 534eb75..48579bc 100644 --- a/sys/netinet6/in6_ifattach.c +++ b/sys/netinet6/in6_ifattach.c @@ -65,7 +65,6 @@ __FBSDID("$FreeBSD$"); unsigned long in6_maxmtu; int ip6_auto_linklocal; struct callout in6_tmpaddrtimer_ch; -extern struct inpcbinfo udbinfo; extern struct inpcbinfo ripcbinfo; #endif diff --git a/sys/netinet6/vinet6.h b/sys/netinet6/vinet6.h index 5c5455c..cc8269c 100644 --- a/sys/netinet6/vinet6.h +++ b/sys/netinet6/vinet6.h @@ -33,7 +33,6 @@ #ifndef _NETINET6_VINET6_H_ #define _NETINET6_VINET6_H_ -#ifdef VIMAGE #include <sys/socket.h> #include <netinet/ip6.h> #include <net/if.h> @@ -154,15 +153,12 @@ struct vnet_inet6 { struct ip6_pktopts _ip6_opts; }; -#endif - #define INIT_VNET_INET6(vnet) \ INIT_FROM_VNET(vnet, VNET_MOD_INET6, struct vnet_inet6, vnet_inet6) #define VNET_INET6(sym) VSYM(vnet_inet6, sym) - /* * Symbol translation macros */ |
