Pseudo interfaces should go at SI_SUB_PSEUDO. However at least
pfsync also depends on pf to be initialized already so pf goes at FIRST and the interfaces go at ANY. Then the (VNET_)SYSINIT startups for pf stays at SI_SUB_PROTO_BEGIN and for pfsync we move to the later SI_SUB_PROTO_IF. This is not ideal either but at least an order that should work for the moment and can be re-fined with the VIMAGE merge, once this will actually work with more than one network stack. MFC after: 3 days
This commit is contained in:
parent
c29a7fb305
commit
5b63183446
sys/contrib/pf/net
@ -429,7 +429,7 @@ static moduledata_t pflog_mod = { "pflog", pflog_modevent, 0 };
|
|||||||
|
|
||||||
#define PFLOG_MODVER 1
|
#define PFLOG_MODVER 1
|
||||||
|
|
||||||
DECLARE_MODULE(pflog, pflog_mod, SI_SUB_PROTO_IFATTACHDOMAIN, SI_ORDER_ANY);
|
DECLARE_MODULE(pflog, pflog_mod, SI_SUB_PSEUDO, SI_ORDER_ANY);
|
||||||
MODULE_VERSION(pflog, PFLOG_MODVER);
|
MODULE_VERSION(pflog, PFLOG_MODVER);
|
||||||
MODULE_DEPEND(pflog, pf, PF_MODVER, PF_MODVER, PF_MODVER);
|
MODULE_DEPEND(pflog, pf, PF_MODVER, PF_MODVER, PF_MODVER);
|
||||||
#endif /* __FreeBSD__ */
|
#endif /* __FreeBSD__ */
|
||||||
|
@ -3380,7 +3380,7 @@ vnet_pfsync_uninit(const void *unused)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* Define startup order. */
|
/* Define startup order. */
|
||||||
#define PFSYNC_SYSINIT_ORDER SI_SUB_PROTO_BEGIN
|
#define PFSYNC_SYSINIT_ORDER SI_SUB_PROTO_IF
|
||||||
#define PFSYNC_MODEVENT_ORDER (SI_ORDER_FIRST) /* On boot slot in here. */
|
#define PFSYNC_MODEVENT_ORDER (SI_ORDER_FIRST) /* On boot slot in here. */
|
||||||
#define PFSYNC_VNET_ORDER (PFSYNC_MODEVENT_ORDER + 2) /* Later still. */
|
#define PFSYNC_VNET_ORDER (PFSYNC_MODEVENT_ORDER + 2) /* Later still. */
|
||||||
|
|
||||||
@ -3430,7 +3430,7 @@ static moduledata_t pfsync_mod = {
|
|||||||
|
|
||||||
#define PFSYNC_MODVER 1
|
#define PFSYNC_MODVER 1
|
||||||
|
|
||||||
DECLARE_MODULE(pfsync, pfsync_mod, SI_SUB_PROTO_IFATTACHDOMAIN, SI_ORDER_ANY);
|
DECLARE_MODULE(pfsync, pfsync_mod, SI_SUB_PSEUDO, SI_ORDER_ANY);
|
||||||
MODULE_VERSION(pfsync, PFSYNC_MODVER);
|
MODULE_VERSION(pfsync, PFSYNC_MODVER);
|
||||||
MODULE_DEPEND(pfsync, pf, PF_MODVER, PF_MODVER, PF_MODVER);
|
MODULE_DEPEND(pfsync, pf, PF_MODVER, PF_MODVER, PF_MODVER);
|
||||||
#endif /* __FreeBSD__ */
|
#endif /* __FreeBSD__ */
|
||||||
|
@ -4450,6 +4450,6 @@ static moduledata_t pf_mod = {
|
|||||||
0
|
0
|
||||||
};
|
};
|
||||||
|
|
||||||
DECLARE_MODULE(pf, pf_mod, SI_SUB_PROTO_IFATTACHDOMAIN, SI_ORDER_FIRST);
|
DECLARE_MODULE(pf, pf_mod, SI_SUB_PSEUDO, SI_ORDER_FIRST);
|
||||||
MODULE_VERSION(pf, PF_MODVER);
|
MODULE_VERSION(pf, PF_MODVER);
|
||||||
#endif /* __FreeBSD__ */
|
#endif /* __FreeBSD__ */
|
||||||
|
Loading…
x
Reference in New Issue
Block a user