summaryrefslogtreecommitdiff
path: root/sys/dev/e1000
diff options
context:
space:
mode:
authorJack F Vogel <jfv@FreeBSD.org>2011-04-01 20:24:51 +0000
committerJack F Vogel <jfv@FreeBSD.org>2011-04-01 20:24:51 +0000
commit62d8da8c3afe8c83b0bf3a0bf569f15b79e2c819 (patch)
tree6c6ffd38053211f5db1772da87365a9d798a2fbd /sys/dev/e1000
parent05f2ecd1faed1cb7f9307d01539306c710b2765b (diff)
Notes
Diffstat (limited to 'sys/dev/e1000')
-rw-r--r--sys/dev/e1000/if_em.c22
1 files changed, 6 insertions, 16 deletions
diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c
index 6dcd90d53bf0..fb6ed6743917 100644
--- a/sys/dev/e1000/if_em.c
+++ b/sys/dev/e1000/if_em.c
@@ -1761,8 +1761,9 @@ em_xmit(struct tx_ring *txr, struct mbuf **m_headp)
u32 txd_upper, txd_lower, txd_used, txd_saved;
int ip_off, poff;
int nsegs, i, j, first, last = 0;
- int error, do_tso, tso_desc = 0;
+ int error, do_tso, tso_desc = 0, remap = 1;
+retry:
m_head = *m_headp;
txd_upper = txd_lower = txd_used = txd_saved = 0;
do_tso = ((m_head->m_pkthdr.csum_flags & CSUM_TSO) != 0);
@@ -1900,7 +1901,7 @@ em_xmit(struct tx_ring *txr, struct mbuf **m_headp)
* All other errors, in particular EINVAL, are fatal and prevent the
* mbuf chain from ever going through. Drop it and report error.
*/
- if (error == EFBIG) {
+ if (error == EFBIG && remap) {
struct mbuf *m;
m = m_defrag(*m_headp, M_DONTWAIT);
@@ -1912,20 +1913,9 @@ em_xmit(struct tx_ring *txr, struct mbuf **m_headp)
}
*m_headp = m;
- /* Try it again */
- error = bus_dmamap_load_mbuf_sg(txr->txtag, map,
- *m_headp, segs, &nsegs, BUS_DMA_NOWAIT);
-
- if (error == ENOMEM) {
- adapter->no_tx_dma_setup++;
- return (error);
- } else if (error != 0) {
- adapter->no_tx_dma_setup++;
- m_freem(*m_headp);
- *m_headp = NULL;
- return (error);
- }
-
+ /* Try it again, but only once */
+ remap = 0;
+ goto retry;
} else if (error == ENOMEM) {
adapter->no_tx_dma_setup++;
return (error);