1 files changed, 3 insertions, 25 deletions
diff --git a/sys/netipsec/ipsec.c b/sys/netipsec/ipsec.c
index c393dce..07ae90e 100644
--- a/sys/netipsec/ipsec.c
+++ b/sys/netipsec/ipsec.c
@@ -240,15 +240,6 @@ static void vshiftl __P((unsigned char *, int, int));
 
 MALLOC_DEFINE(M_IPSEC_INPCB, "inpcbpolicy", "inpcb-resident ipsec policy");
 
-static int ipsec_iattach(const void *);
-#ifdef VIMAGE
-static const vnet_modinfo_t vnet_ipsec_modinfo = {
-	.vmi_id		= VNET_MOD_IPSEC,
-	.vmi_name	= "ipsec",
-	.vmi_iattach	= ipsec_iattach,
-};
-#endif
-
 /*
  * Return a held reference to the default SP.
  */
@@ -1711,27 +1702,14 @@ ipsec_dumpmbuf(struct mbuf *m)
 }
 
 static void
-ipsec_attach(const void *unused __unused)
-{
-
-#ifdef VIMAGE
-	vnet_mod_register(&vnet_ipsec_modinfo);
-#else
-	ipsec_iattach(NULL);
-#endif
-}
-
-static int
-ipsec_iattach(const void *unused __unused)
+ipsec_init(const void *unused __unused)
 {
 
 	SECPOLICY_LOCK_INIT(&V_ip4_def_policy);
 	V_ip4_def_policy.refcnt = 1;			/* NB: disallow free. */
-
-	return (0);
 }
-
-SYSINIT(ipsec, SI_SUB_PROTO_DOMAIN, SI_ORDER_FIRST, ipsec_attach, NULL);
+VNET_SYSINIT(ipsec_init, SI_SUB_PROTO_DOMAININIT, SI_ORDER_ANY, ipsec_init,
+    NULL);
 
 
 /* XXX This stuff doesn't belong here... */