From e0b4edbdcc3558d3f38af8398f995c2e9f019f07 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Tue, 6 Nov 2018 15:42:44 +0100 Subject: Update to FreeBSD head 2018-11-15 Git mirror commit a18b0830c4be01b39489a891b63d6023ada6358a. Update #3472. --- freebsd/sys/netinet/in_gif.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'freebsd/sys/netinet/in_gif.c') diff --git a/freebsd/sys/netinet/in_gif.c b/freebsd/sys/netinet/in_gif.c index b8732a33..be0303d0 100644 --- a/freebsd/sys/netinet/in_gif.c +++ b/freebsd/sys/netinet/in_gif.c @@ -150,7 +150,8 @@ in_gif_srcaddr(void *arg __unused, const struct sockaddr *sa, const struct sockaddr_in *sin; struct gif_softc *sc; - if (V_ipv4_srchashtbl == NULL) + /* Check that VNET is ready */ + if (V_ipv4_hashtbl == NULL) return; MPASS(in_epoch(net_epoch_preempt)); @@ -459,6 +460,8 @@ in_gif_uninit(void) } if (V_ipv4_hashtbl != NULL) { gif_hashdestroy(V_ipv4_hashtbl); + V_ipv4_hashtbl = NULL; + GIF_WAIT(); gif_hashdestroy(V_ipv4_srchashtbl); } } -- cgit v1.2.3