D45595.diff
No OneTemporary
Actions

Size

689 B

Referenced Files

None

Subscribers

None

D45595.diff
View Options

	diff --git a/sys/net/if.c b/sys/net/if.c
	--- a/sys/net/if.c
	+++ b/sys/net/if.c
	@@ -1343,8 +1343,8 @@
	/* XXX Lock interfaces to avoid races. */
	CURVNET_SET_QUIET(pr->pr_vnet);
	difp = ifunit(ifname);
	+ CURVNET_RESTORE();
	if (difp != NULL) {
	- CURVNET_RESTORE();
	prison_free(pr);
	return (EEXIST);
	}
	@@ -1354,16 +1354,13 @@
	shutdown = VNET_IS_SHUTTING_DOWN(ifp->if_vnet);
	if (shutdown) {
	sx_xunlock(&ifnet_detach_sxlock);
	- CURVNET_RESTORE();
	prison_free(pr);
	return (EBUSY);
	}
	- CURVNET_RESTORE();

	found = if_unlink_ifnet(ifp, true);
	if (! found) {
	sx_xunlock(&ifnet_detach_sxlock);
	- CURVNET_RESTORE();
	prison_free(pr);
	return (ENODEV);
	}