diff options
| author | zec <zec@FreeBSD.org> | 2009-04-26 22:06:42 +0000 |
|---|---|---|
| committer | zec <zec@FreeBSD.org> | 2009-04-26 22:06:42 +0000 |
| commit | 8d976eab5c2cbc080800be588a8572ebec4a7795 (patch) | |
| tree | 1c2ccb403d29ceb85ca7992b6b96623f561c79db /sys/netinet6 | |
| parent | 1e44d091e1be67e4c879788035a2a9161eace942 (diff) | |
| download | FreeBSD-src-8d976eab5c2cbc080800be588a8572ebec4a7795.zip FreeBSD-src-8d976eab5c2cbc080800be588a8572ebec4a7795.tar.gz | |
In preparation for turning on options VIMAGE in next commits,
rearrange / replace / adjust several INIT_VNET_* initializer
macros, all of which currently resolve to whitespace.
Reviewed by: bz (an older version of the patch)
Approved by: julian (mentor)
Diffstat (limited to 'sys/netinet6')
| -rw-r--r-- | sys/netinet6/in6_rmx.c | 6 | ||||
| -rw-r--r-- | sys/netinet6/nd6_rtr.c | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/sys/netinet6/in6_rmx.c b/sys/netinet6/in6_rmx.c index 6df443d..3cc4468 100644 --- a/sys/netinet6/in6_rmx.c +++ b/sys/netinet6/in6_rmx.c @@ -289,8 +289,7 @@ static void in6_rtqtimo(void *rock) { CURVNET_SET_QUIET((struct vnet *) rock); - INIT_VNET_NET((struct vnet *) rock); - INIT_VNET_INET6((struct vnet *) rock); + INIT_VNET_INET6(curvnet); struct radix_node_head *rnh = rock; struct rtqk_arg arg; struct timeval atv; @@ -377,8 +376,7 @@ static void in6_mtutimo(void *rock) { CURVNET_SET_QUIET((struct vnet *) rock); - INIT_VNET_NET((struct vnet *) rock); - INIT_VNET_INET6((struct vnet *) rock); + INIT_VNET_INET6(curvnet); struct radix_node_head *rnh = rock; struct mtuex_arg arg; struct timeval atv; diff --git a/sys/netinet6/nd6_rtr.c b/sys/netinet6/nd6_rtr.c index 5c721a2..41a100d 100644 --- a/sys/netinet6/nd6_rtr.c +++ b/sys/netinet6/nd6_rtr.c @@ -1549,6 +1549,7 @@ pfxlist_onlink_check() int nd6_prefix_onlink(struct nd_prefix *pr) { + INIT_VNET_NET(curvnet); INIT_VNET_INET6(curvnet); struct ifaddr *ifa; struct ifnet *ifp = pr->ndpr_ifp; |
