diff options
| author | emax <emax@FreeBSD.org> | 2005-01-06 17:45:03 +0000 |
|---|---|---|
| committer | emax <emax@FreeBSD.org> | 2005-01-06 17:45:03 +0000 |
| commit | a74e29628a27c26767dcae08313296c10d3f3603 (patch) | |
| tree | dce07ddf7dac770bab5e03e162e547a0a3905f9e /sys | |
| parent | d48e9e9ea11ebb6b2c5df5920cb3b0e9d46f4ba8 (diff) | |
| download | FreeBSD-src-a74e29628a27c26767dcae08313296c10d3f3603.zip FreeBSD-src-a74e29628a27c26767dcae08313296c10d3f3603.tar.gz | |
Introduce new startup level SI_SUB_NETGRAPH that is after
SI_SUB_INIT_IF but before SI_SUB_DRIVERS. Make Netgraph(4)
framework initialize at SI_SUB_NETGRAPH level.
This does not address the bigger problem: MODULE_DEPEND
does not seem to work when modules are compiled in the
kernel, but it fixes the problem with Netgraph Bluetooth
device drivers reported by a few folks.
PR: i386/69876
Reviewed by: julian, rik, scottl
MFC after: 3 days
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/netgraph/ng_base.c | 2 | ||||
| -rw-r--r-- | sys/sys/kernel.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/sys/netgraph/ng_base.c b/sys/netgraph/ng_base.c index 59a6ffd..5940b5e 100644 --- a/sys/netgraph/ng_base.c +++ b/sys/netgraph/ng_base.c @@ -2991,7 +2991,7 @@ static moduledata_t netgraph_mod = { 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, ""); diff --git a/sys/sys/kernel.h b/sys/sys/kernel.h index 4b4d707..fdc635f 100644 --- a/sys/sys/kernel.h +++ b/sys/sys/kernel.h @@ -132,6 +132,7 @@ enum sysinit_sub_id { 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*/ |
