From owner-svn-src-all@FreeBSD.ORG  Wed Apr 15 18:15:29 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A75AA1065676;
	Wed, 15 Apr 2009 18:15:29 +0000 (UTC) (envelope-from zec@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 968FC8FC1B;
	Wed, 15 Apr 2009 18:15:29 +0000 (UTC) (envelope-from zec@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 n3FIFTJn050767;
	Wed, 15 Apr 2009 18:15:29 GMT (envelope-from zec@svn.freebsd.org)
Received: (from zec@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3FIFTLf050766;
	Wed, 15 Apr 2009 18:15:29 GMT (envelope-from zec@svn.freebsd.org)
Message-Id: <200904151815.n3FIFTLf050766@svn.freebsd.org>
From: Marko Zec <zec@FreeBSD.org>
Date: Wed, 15 Apr 2009 18:15:29 +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: r191112 - head/sys/net
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 15 Apr 2009 18:15:30 -0000

Author: zec
Date: Wed Apr 15 18:15:29 2009
New Revision: 191112
URL: http://svn.freebsd.org/changeset/base/191112

Log:
  In the !VIMAGE_GLOBALS case, make sure not to call vnet_net_iattach()
  both via the vnet_mod_register() framework and then directly, but only
  once.
  
  Reviewed by:	bz
  Approved by:	julian (mentor)

Modified:
  head/sys/net/if.c

Modified: head/sys/net/if.c
==============================================================================
--- head/sys/net/if.c	Wed Apr 15 17:31:22 2009	(r191111)
+++ head/sys/net/if.c	Wed Apr 15 18:15:29 2009	(r191112)
@@ -401,8 +401,9 @@ if_init(void *dummy __unused)
 
 #ifndef VIMAGE_GLOBALS
 	vnet_mod_register(&vnet_net_modinfo);
-#endif
+#else
 	vnet_net_iattach(NULL);
+#endif
 
 	IFNET_LOCK_INIT();
 	ifdev_setbyindex(0, make_dev(&net_cdevsw, 0, UID_ROOT, GID_WHEEL,