From owner-p4-projects@FreeBSD.ORG  Thu Jan  6 17:58:04 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0436716A4D0; Thu,  6 Jan 2005 17:58:04 +0000 (GMT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id D376416A4CE
	for <perforce@freebsd.org>; Thu,  6 Jan 2005 17:58:03 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id BA6A443D49
	for <perforce@freebsd.org>; Thu,  6 Jan 2005 17:58:03 +0000 (GMT)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j06Hw3q1035417
	for <perforce@freebsd.org>; Thu, 6 Jan 2005 17:58:03 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j06Hw394035414
	for perforce@freebsd.org; Thu, 6 Jan 2005 17:58:03 GMT
	(envelope-from jhb@freebsd.org)
Date: Thu, 6 Jan 2005 17:58:03 GMT
Message-Id: <200501061758.j06Hw394035414@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 68395 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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: Thu, 06 Jan 2005 17:58:04 -0000

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

Change 68395 by jhb@jhb_slimer on 2005/01/06 17:57:06

	IFC @68392.

Affected files ...

.. //depot/projects/smpng/sys/netgraph/ng_base.c#30 integrate
.. //depot/projects/smpng/sys/sys/kernel.h#29 integrate

Differences ...

==== //depot/projects/smpng/sys/netgraph/ng_base.c#30 (text+ko) ====

@@ -36,7 +36,7 @@
  * Authors: Julian Elischer <julian@freebsd.org>
  *          Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD: src/sys/netgraph/ng_base.c,v 1.90 2004/12/23 13:09:37 glebius Exp $
+ * $FreeBSD: src/sys/netgraph/ng_base.c,v 1.91 2005/01/06 17:45:02 emax Exp $
  * $Whistle: ng_base.c,v 1.39 1999/01/28 23:54:53 julian Exp $
  */
 
@@ -2991,7 +2991,7 @@
 	ngb_mod_event,
 	(NULL)
 };
-DECLARE_MODULE(netgraph, netgraph_mod, SI_SUB_DRIVERS, SI_ORDER_MIDDLE);
+DECLARE_MODULE(netgraph, netgraph_mod, SI_SUB_NETGRAPH, SI_ORDER_MIDDLE);
 SYSCTL_NODE(_net, OID_AUTO, graph, CTLFLAG_RW, 0, "netgraph Family");
 SYSCTL_INT(_net_graph, OID_AUTO, abi_version, CTLFLAG_RD, 0, NG_ABI_VERSION,"");
 SYSCTL_INT(_net_graph, OID_AUTO, msg_version, CTLFLAG_RD, 0, NG_VERSION, "");

==== //depot/projects/smpng/sys/sys/kernel.h#29 (text+ko) ====

@@ -39,7 +39,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kernel.h	8.3 (Berkeley) 1/21/94
- * $FreeBSD: src/sys/sys/kernel.h,v 1.122 2004/12/06 11:28:02 pjd Exp $
+ * $FreeBSD: src/sys/sys/kernel.h,v 1.123 2005/01/06 17:45:03 emax Exp $
  */
 
 #ifndef _SYS_KERNEL_H_
@@ -132,6 +132,7 @@
 	SI_SUB_SOFTINTR		= 0x2800001,	/* start soft interrupt thread */
 	SI_SUB_DEVFS		= 0x2F00000,	/* devfs ready for devices */
 	SI_SUB_INIT_IF		= 0x3000000,	/* prep for net interfaces */
+	SI_SUB_NETGRAPH		= 0x3010000,	/* Let Netgraph initialize */
 	SI_SUB_DRIVERS		= 0x3100000,	/* Let Drivers initialize */
 	SI_SUB_CONFIGURE	= 0x3800000,	/* Configure devices */
 	SI_SUB_VFS		= 0x4000000,	/* virtual filesystem*/