svn commit: r195788 - head/sys/netinet

[Robert Watson]

Author: rwatson
Date: Mon Jul 20 19:40:09 2009
New Revision: 195788
URL: http://svn.freebsd.org/changeset/base/195788

Log:
  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)

Modified:
  head/sys/netinet/ip_input.c

Modified: head/sys/netinet/ip_input.c
==============================================================================
--- head/sys/netinet/ip_input.c	Mon Jul 20 19:33:22 2009	(r195787)
+++ head/sys/netinet/ip_input.c	Mon Jul 20 19:40:09 2009	(r195788)
@@ -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);
 }