From owner-p4-projects@FreeBSD.ORG  Wed Apr 22 13:09:55 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6365F1065672; Wed, 22 Apr 2009 13:09:54 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2213A106566C
	for <perforce@freebsd.org>; Wed, 22 Apr 2009 13:09:54 +0000 (UTC)
	(envelope-from zec@fer.hr)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 10BC88FC08
	for <perforce@freebsd.org>; Wed, 22 Apr 2009 13:09:54 +0000 (UTC)
	(envelope-from zec@fer.hr)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3MD9rpa037568
	for <perforce@freebsd.org>; Wed, 22 Apr 2009 13:09:53 GMT
	(envelope-from zec@fer.hr)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3MD9rpY037566
	for perforce@freebsd.org; Wed, 22 Apr 2009 13:09:53 GMT
	(envelope-from zec@fer.hr)
Date: Wed, 22 Apr 2009 13:09:53 GMT
Message-Id: <200904221309.n3MD9rpY037566@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	zec@fer.hr using -f
From: Marko Zec <zec@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 160933 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 22 Apr 2009 13:09:55 -0000

http://perforce.freebsd.org/chv.cgi?CH=160933

Change 160933 by zec@zec_amdx2 on 2009/04/22 13:09:16

	Unbreak netgraph vnet module registration.

Affected files ...

.. //depot/projects/vimage/src/sys/netgraph/ng_base.c#54 edit

Differences ...

==== //depot/projects/vimage/src/sys/netgraph/ng_base.c#54 (text+ko) ====

@@ -3102,6 +3102,11 @@
 	switch (event) {
 	case MOD_LOAD:
 		/* Initialize everything. */
+#ifndef VIMAGE_GLOBALS
+		vnet_mod_register(&vnet_netgraph_modinfo);
+#else
+		vnet_netgraph_iattach(NULL);
+#endif /* !VIMAGE */
 		NG_WORKLIST_LOCK_INIT();
 		mtx_init(&ng_typelist_mtx, "netgraph types mutex", NULL,
 		    MTX_DEF);
@@ -3135,11 +3140,6 @@
 				break;
 			}
 		}
-#ifndef VIMAGE_GLOBALS
-		vnet_mod_register(&vnet_netgraph_modinfo);
-#else
-		vnet_netgraph_iattach(NULL);
-#endif /* !VIMAGE */
 		break;
 	case MOD_UNLOAD:
 		/* You can't unload it because an interface may be using it. */