D21797.id.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D21797.id.diff
View Options

	Index: sys/net/iflib.c
	===================================================================
	--- sys/net/iflib.c
	+++ sys/net/iflib.c
	@@ -4076,7 +4076,7 @@
	#define IFCAP_FLAGS (IFCAP_HWCSUM_IPV6 \| IFCAP_HWCSUM \| IFCAP_LRO \| \
	IFCAP_TSO \| IFCAP_VLAN_HWTAGGING \| IFCAP_HWSTATS \| \
	IFCAP_VLAN_MTU \| IFCAP_VLAN_HWFILTER \| \
	- IFCAP_VLAN_HWTSO \| IFCAP_VLAN_HWCSUM)
	+ IFCAP_VLAN_HWTSO \| IFCAP_VLAN_HWCSUM \| IFCAP_NOMAP)

	static int
	iflib_if_ioctl(if_t ifp, u_long command, caddr_t data)
	@@ -4201,7 +4201,7 @@

	oldmask = if_getcapenable(ifp);
	mask = ifr->ifr_reqcap ^ oldmask;
	- mask &= ctx->ifc_softc_ctx.isc_capabilities;
	+ mask &= ctx->ifc_softc_ctx.isc_capabilities \| IFCAP_NOMAP;
	setmask = 0;
	#ifdef TCP_OFFLOAD
	setmask \|= mask & (IFCAP_TOE4\|IFCAP_TOE6);
	@@ -4596,8 +4596,10 @@
	MPASS(scctx->isc_tx_csum_flags);
	#endif

	- if_setcapabilities(ifp, scctx->isc_capabilities \| IFCAP_HWSTATS);
	- if_setcapenable(ifp, scctx->isc_capenable \| IFCAP_HWSTATS);
	+ if_setcapabilities(ifp,
	+ scctx->isc_capabilities \| IFCAP_HWSTATS \| IFCAP_NOMAP);
	+ if_setcapenable(ifp,
	+ scctx->isc_capenable \| IFCAP_HWSTATS \| IFCAP_NOMAP);

	if (scctx->isc_ntxqsets == 0 \|\| (scctx->isc_ntxqsets_max && scctx->isc_ntxqsets_max < scctx->isc_ntxqsets))
	scctx->isc_ntxqsets = scctx->isc_ntxqsets_max;