diff options
| -rw-r--r-- | sys/net/route.c | 2 | ||||
| -rw-r--r-- | sys/netinet/igmp.c | 2 | ||||
| -rw-r--r-- | sys/netinet/tcp_timewait.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sys/net/route.c b/sys/net/route.c index 4ebdaf6..195145c 100644 --- a/sys/net/route.c +++ b/sys/net/route.c @@ -1131,10 +1131,10 @@ bad: int rt_setgate(struct rtentry *rt, struct sockaddr *dst, struct sockaddr *gate) { - INIT_VNET_NET(curvnet); /* XXX dst may be overwritten, can we move this to below */ int dlen = SA_SIZE(dst), glen = SA_SIZE(gate); #ifdef INVARIANTS + INIT_VNET_NET(curvnet); struct radix_node_head *rnh = V_rt_tables[rt->rt_fibnum][dst->sa_family]; #endif diff --git a/sys/netinet/igmp.c b/sys/netinet/igmp.c index 1c618a3..2bbd10d 100644 --- a/sys/netinet/igmp.c +++ b/sys/netinet/igmp.c @@ -3617,7 +3617,9 @@ vnet_igmp_iattach(const void *unused __unused) static int vnet_igmp_idetach(const void *unused __unused) { +#ifdef INVARIANTS INIT_VNET_INET(curvnet); +#endif CTR1(KTR_IGMPV3, "%s: tearing down", __func__); diff --git a/sys/netinet/tcp_timewait.c b/sys/netinet/tcp_timewait.c index 08f1db4..5ee6087 100644 --- a/sys/netinet/tcp_timewait.c +++ b/sys/netinet/tcp_timewait.c @@ -188,9 +188,7 @@ tcp_tw_init(void) void tcp_twstart(struct tcpcb *tp) { -#if defined(INVARIANTS) || defined(INVARIANT_SUPPORT) INIT_VNET_INET(tp->t_vnet); -#endif struct tcptw *tw; struct inpcb *inp = tp->t_inpcb; int acknow; |
