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)
This commit is contained in:
parent
65588fd503
commit
a511354af4
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=195788
@ -284,6 +284,8 @@ ip_init(void)
|
|||||||
struct protosw *pr;
|
struct protosw *pr;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
|
V_ip_id = time_second & 0xffff;
|
||||||
|
|
||||||
TAILQ_INIT(&V_in_ifaddrhead);
|
TAILQ_INIT(&V_in_ifaddrhead);
|
||||||
V_in_ifaddrhashtbl = hashinit(INADDR_NHASH, M_IFADDR, &V_in_ifaddrhmask);
|
V_in_ifaddrhashtbl = hashinit(INADDR_NHASH, M_IFADDR, &V_in_ifaddrhmask);
|
||||||
|
|
||||||
@ -342,7 +344,6 @@ ip_init(void)
|
|||||||
NULL, EVENTHANDLER_PRI_ANY);
|
NULL, EVENTHANDLER_PRI_ANY);
|
||||||
|
|
||||||
/* Initialize various other remaining things. */
|
/* Initialize various other remaining things. */
|
||||||
V_ip_id = time_second & 0xffff;
|
|
||||||
IPQ_LOCK_INIT();
|
IPQ_LOCK_INIT();
|
||||||
netisr_register(&ip_nh);
|
netisr_register(&ip_nh);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user