D54175.id180257.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D54175.id180257.diff
View Options

	diff --git a/sys/net/if_ovpn.c b/sys/net/if_ovpn.c
	--- a/sys/net/if_ovpn.c
	+++ b/sys/net/if_ovpn.c
	@@ -2847,9 +2847,19 @@
	};
	V_ovpn_cloner = ifc_attach_cloner(ovpngroupname, &req);
	}
	-VNET_SYSINIT(vnet_ovpn_init, SI_SUB_PSEUDO, SI_ORDER_ANY,
	+VNET_SYSINIT(vnet_ovpn_init, SI_SUB_PROTO_IFATTACHDOMAIN, SI_ORDER_ANY,
	vnet_ovpn_init, NULL);

	+static void
	+vnet_ovpn_uninit(void)
	+{
	+
	+ if (V_ovpn_cloner != NULL)
	+ ifc_detach_cloner(V_ovpn_cloner);
	+}
	+VNET_SYSUNINIT(vnet_ovpn_uninit, SI_SUB_PROTO_IFATTACHDOMAIN, SI_ORDER_ANY,
	+ vnet_ovpn_uninit, NULL);
	+
	static int
	ovpn_prison_remove(void obj, void data __unused)
	{
	@@ -2891,12 +2901,6 @@
	case MOD_UNLOAD:
	if (ovpn_osd_jail_slot != 0)
	osd_jail_deregister(ovpn_osd_jail_slot);
	- CURVNET_SET(vnet0);
	- if (V_ovpn_cloner != NULL) {
	- ifc_detach_cloner(V_ovpn_cloner);
	- V_ovpn_cloner = NULL;
	- }
	- CURVNET_RESTORE();
	break;
	default:
	return (EOPNOTSUPP);
	@@ -2911,6 +2915,6 @@
	0
	};

	-DECLARE_MODULE(if_ovpn, ovpn_mod, SI_SUB_PSEUDO, SI_ORDER_ANY);
	+DECLARE_MODULE(if_ovpn, ovpn_mod, SI_SUB_PROTO_IFATTACHDOMAIN, SI_ORDER_ANY);
	MODULE_VERSION(if_ovpn, 1);
	MODULE_DEPEND(if_ovpn, crypto, 1, 1, 1);