From owner-svn-src-head@FreeBSD.ORG  Mon Jul 20 19:40:09 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A96111065672;
	Mon, 20 Jul 2009 19:40:09 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 97CAF8FC28;
	Mon, 20 Jul 2009 19:40:09 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n6KJe9OK087010;
	Mon, 20 Jul 2009 19:40:09 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n6KJe9CZ087008;
	Mon, 20 Jul 2009 19:40:09 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <200907201940.n6KJe9CZ087008@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Mon, 20 Jul 2009 19:40:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r195788 - head/sys/netinet
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 20 Jul 2009 19:40:10 -0000

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);
 }