From a511354af428e5a61b72af6de7523fe56c35015f Mon Sep 17 00:00:00 2001 From: Robert Watson Date: Mon, 20 Jul 2009 19:40:09 +0000 Subject: [PATCH] Back out the moving in r195782 of V_ip_id's initialization from the top back to the bottom of ip_init() as found in 7.x. I missed the fact that the bottom half of the init routine only runs in the !VNET case. Submitted by: zec Approved by: re (vimage blanket) --- sys/netinet/ip_input.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c index 01a0b3190326..f95cf0da04d6 100644 --- a/sys/netinet/ip_input.c +++ b/sys/netinet/ip_input.c @@ -284,6 +284,8 @@ ip_init(void) struct protosw *pr; int i; + V_ip_id = time_second & 0xffff; + TAILQ_INIT(&V_in_ifaddrhead); V_in_ifaddrhashtbl = hashinit(INADDR_NHASH, M_IFADDR, &V_in_ifaddrhmask); @@ -342,7 +344,6 @@ ip_init(void) NULL, EVENTHANDLER_PRI_ANY); /* Initialize various other remaining things. */ - V_ip_id = time_second & 0xffff; IPQ_LOCK_INIT(); netisr_register(&ip_nh); }