D5918.id15088.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D5918.id15088.diff
View Options

	Index: sys/dev/e1000/if_em.c
	===================================================================
	--- sys/dev/e1000/if_em.c
	+++ sys/dev/e1000/if_em.c
	@@ -2092,7 +2092,7 @@
	txr->tx_tso = FALSE;
	}

	- if (nsegs > (txr->tx_avail - EM_MAX_SCATTER)) {
	+ if (txr->tx_avail < (nsegs + EM_MAX_SCATTER)) {
	txr->no_desc_avail++;
	bus_dmamap_unload(txr->txtag, map);
	return (ENOBUFS);
	Index: sys/dev/e1000/if_igb.c
	===================================================================
	--- sys/dev/e1000/if_igb.c
	+++ sys/dev/e1000/if_igb.c
	@@ -1887,7 +1887,7 @@
	}

	/* Make certain there are enough descriptors */
	- if (nsegs > txr->tx_avail - 2) {
	+ if (txr->tx_avail < (nsegs + 2)) {
	txr->no_desc_avail++;
	bus_dmamap_unload(txr->txtag, map);
	return (ENOBUFS);
	Index: sys/dev/e1000/if_lem.c
	===================================================================
	--- sys/dev/e1000/if_lem.c
	+++ sys/dev/e1000/if_lem.c
	@@ -1699,7 +1699,7 @@
	return (error);
	}

	- if (nsegs > (adapter->num_tx_desc_avail - 2)) {
	+ if (adapter->num_tx_desc_avail < (nsegs + 2)) {
	adapter->no_tx_desc_avail2++;
	bus_dmamap_unload(adapter->txtag, map);
	return (ENOBUFS);
	Index: sys/dev/ixgbe/ix_txrx.c
	===================================================================
	--- sys/dev/ixgbe/ix_txrx.c
	+++ sys/dev/ixgbe/ix_txrx.c
	@@ -402,7 +402,7 @@
	}

	/* Make certain there are enough descriptors */
	- if (nsegs > txr->tx_avail - 2) {
	+ if (txr->tx_avail < (nsegs + 2)) {
	txr->no_desc_avail++;
	bus_dmamap_unload(txr->txtag, map);
	return (ENOBUFS);