D25252.diff
No OneTemporary
Actions

Size

746 B

Referenced Files

None

Subscribers

None

D25252.diff
View Options

	Index: head/sys/net/iflib.c
	===================================================================
	--- head/sys/net/iflib.c
	+++ head/sys/net/iflib.c
	@@ -1099,6 +1099,7 @@
	* rxr->next_check is set to 0 on a ring reinit
	*/
	if (netmap_no_pendintr \|\| force_update) {
	+ uint32_t hwtail_lim = nm_prev(kring->nr_hwcur, lim);
	int crclen = iflib_crcstrip ? 0 : 4;
	int error, avail;

	@@ -1108,7 +1109,7 @@
	nm_i = netmap_idx_n2k(kring, nic_i);
	avail = ctx->isc_rxd_available(ctx->ifc_softc,
	rxq->ifr_id, nic_i, USHRT_MAX);
	- for (n = 0; avail > 0; n++, avail--) {
	+ for (n = 0; avail > 0 && nm_i != hwtail_lim; n++, avail--) {
	rxd_info_zero(&ri);
	ri.iri_frags = rxq->ifr_frags;
	ri.iri_qsidx = kring->ring_id;