D55828.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D55828.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
	@@ -1188,7 +1188,6 @@
	struct prison *pr;
	struct ifnet *difp;
	bool found;
	- bool shutdown;

	MPASS(ifindex_table[ifp->if_index].ife_ifnet == ifp);

	@@ -1218,14 +1217,6 @@
	}
	sx_xlock(&ifnet_detach_sxlock);

	- /* Make sure the VNET is stable. */
	- shutdown = VNET_IS_SHUTTING_DOWN(ifp->if_vnet);
	- if (shutdown) {
	- sx_xunlock(&ifnet_detach_sxlock);
	- prison_free(pr);
	- return (EBUSY);
	- }
	-
	found = if_unlink_ifnet(ifp, true);
	if (! found) {
	sx_xunlock(&ifnet_detach_sxlock);
	@@ -1252,7 +1243,6 @@
	struct vnet *vnet_dst;
	struct ifnet *ifp;
	int found __diagused;
	- bool shutdown;

	/* Try to find the prison within our visibility. */
	sx_slock(&allprison_lock);
	@@ -1280,14 +1270,6 @@
	return (EEXIST);
	}

	- /* Make sure the VNET is stable. */
	- shutdown = VNET_IS_SHUTTING_DOWN(ifp->if_vnet);
	- if (shutdown) {
	- CURVNET_RESTORE();
	- prison_free(pr);
	- return (EBUSY);
	- }
	-
	/* Get interface back from child jail/vnet. */
	found = if_unlink_ifnet(ifp, true);
	MPASS(found);