svn commit: r226532 - head/sys/contrib/pf/net

[Bjoern A. Zeeb]

Author: bz
Date: Wed Oct 19 10:04:24 2011
New Revision: 226532
URL: http://svn.freebsd.org/changeset/base/226532

Log:
  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

Modified:
  head/sys/contrib/pf/net/if_pflog.c
  head/sys/contrib/pf/net/if_pfsync.c
  head/sys/contrib/pf/net/pf_ioctl.c

Modified: head/sys/contrib/pf/net/if_pflog.c
==============================================================================
--- head/sys/contrib/pf/net/if_pflog.c	Wed Oct 19 09:34:40 2011	(r226531)
+++ head/sys/contrib/pf/net/if_pflog.c	Wed Oct 19 10:04:24 2011	(r226532)
@@ -429,7 +429,7 @@ static moduledata_t pflog_mod = { "pflog
 
 #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_DEPEND(pflog, pf, PF_MODVER, PF_MODVER, PF_MODVER);
 #endif /* __FreeBSD__ */

Modified: head/sys/contrib/pf/net/if_pfsync.c
==============================================================================
--- head/sys/contrib/pf/net/if_pfsync.c	Wed Oct 19 09:34:40 2011	(r226531)
+++ head/sys/contrib/pf/net/if_pfsync.c	Wed Oct 19 10:04:24 2011	(r226532)
@@ -3380,7 +3380,7 @@ vnet_pfsync_uninit(const void *unused)
 }
 
 /* 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_VNET_ORDER	(PFSYNC_MODEVENT_ORDER + 2) /* Later still. */
 
@@ -3430,7 +3430,7 @@ static moduledata_t pfsync_mod = {
 
 #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_DEPEND(pfsync, pf, PF_MODVER, PF_MODVER, PF_MODVER);
 #endif /* __FreeBSD__ */

Modified: head/sys/contrib/pf/net/pf_ioctl.c
==============================================================================
--- head/sys/contrib/pf/net/pf_ioctl.c	Wed Oct 19 09:34:40 2011	(r226531)
+++ head/sys/contrib/pf/net/pf_ioctl.c	Wed Oct 19 10:04:24 2011	(r226532)
@@ -4450,6 +4450,6 @@ static moduledata_t pf_mod = {
 	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);
 #endif /* __FreeBSD__ */