diff options
| author | rwatson <rwatson@FreeBSD.org> | 2009-07-20 19:40:09 +0000 |
|---|---|---|
| committer | rwatson <rwatson@FreeBSD.org> | 2009-07-20 19:40:09 +0000 |
| commit | 90830ed53df5dd8d98a0dd6849e14af6482c8911 (patch) | |
| tree | 0ece4ef795030768b1ea0534d9b5c835cb60cee5 /sys/netinet/ip_input.c | |
| parent | 2e0ead9bff63a683d717b2a523d25b3ccd790998 (diff) | |
| download | FreeBSD-src-90830ed53df5dd8d98a0dd6849e14af6482c8911.zip FreeBSD-src-90830ed53df5dd8d98a0dd6849e14af6482c8911.tar.gz | |
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)
Diffstat (limited to 'sys/netinet/ip_input.c')
| -rw-r--r-- | sys/netinet/ip_input.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c index 01a0b31..f95cf0d 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); } |
