PERFORCE change 68395 for review

[John Baldwin]

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

Change 68395 by jhb at 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 at freebsd.org>
  *          Archie Cobbs <archie at 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*/