D22153.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D22153.diff
View Options

	Index: head/sys/netinet/ip_reass.c
	===================================================================
	--- head/sys/netinet/ip_reass.c
	+++ head/sys/netinet/ip_reass.c
	@@ -632,14 +632,17 @@

	KASSERT(ifp != NULL, ("%s: ifp is NULL", __func__));

	+ CURVNET_SET_QUIET(ifp->if_vnet);
	+
	/*
	* Skip processing if IPv4 reassembly is not initialised or
	* torn down by ipreass_destroy().
	*/
	- if (V_ipq_zone == NULL)
	+ if (V_ipq_zone == NULL) {
	+ CURVNET_RESTORE();
	return;
	+ }

	- CURVNET_SET_QUIET(ifp->if_vnet);
	for (i = 0; i < IPREASS_NHASH; i++) {
	IPQ_LOCK(i);
	/* Scan fragment list. */
	Index: head/sys/netinet6/frag6.c
	===================================================================
	--- head/sys/netinet6/frag6.c
	+++ head/sys/netinet6/frag6.c
	@@ -307,16 +307,18 @@

	KASSERT(ifp != NULL, ("%s: ifp is NULL", __func__));

	+ CURVNET_SET_QUIET(ifp->if_vnet);
	#ifdef VIMAGE
	/*
	* Skip processing if IPv6 reassembly is not initialised or
	* torn down by frag6_destroy().
	*/
	- if (!V_frag6_on)
	+ if (!V_frag6_on) {
	+ CURVNET_RESTORE();
	return;
	+ }
	#endif

	- CURVNET_SET_QUIET(ifp->if_vnet);
	for (bucket = 0; bucket < IP6REASS_NHASH; bucket++) {
	IP6QB_LOCK(bucket);
	head = IP6QB_HEAD(bucket);