diff options
author | jfv <jfv@FreeBSD.org> | 2009-09-10 18:53:34 +0000 |
---|---|---|
committer | jfv <jfv@FreeBSD.org> | 2009-09-10 18:53:34 +0000 |
commit | 73d745d48ddd932f2e129830b95e94b72c8cda6f (patch) | |
tree | 8f35cc5eccd1ad4e366329f0ca2773e855020e51 /sys/dev/e1000 | |
parent | 532c339625544823a2514f6e3f090c801126bafa (diff) | |
download | FreeBSD-src-73d745d48ddd932f2e129830b95e94b72c8cda6f.zip FreeBSD-src-73d745d48ddd932f2e129830b95e94b72c8cda6f.tar.gz |
Fix for pr 138516
An mbuf is not requeued when a xmit fails.
MFC: 3 days
Diffstat (limited to 'sys/dev/e1000')
-rw-r--r-- | sys/dev/e1000/if_em.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c index 1def876..d353cc6 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -1034,9 +1034,10 @@ em_mq_start_locked(struct ifnet *ifp, struct mbuf *m) return (error); } else if (drbr_empty(ifp, adapter->br) && (adapter->num_tx_desc_avail > EM_TX_OP_THRESHOLD)) { - if (em_xmit(adapter, &m)) { - if (m && (error = drbr_enqueue(ifp, adapter->br, m)) != 0) - return (error); + if (error = em_xmit(adapter, &m)) { + if (m != NULL) + error = drbr_enqueue(ifp, adapter->br, m); + return (error); } else { /* * We've bypassed the buf ring so we need to update @@ -1063,8 +1064,12 @@ process: next = drbr_dequeue(ifp, adapter->br); if (next == NULL) break; - if (em_xmit(adapter, &next)) + if (error = em_xmit(adapter, &next)) { + if (next != NULL) + error = drbr_enqueue(ifp, adapter->br, next); break; + } + drbr_stats_update(ifp, next->m_pkthdr.len, next->m_flags); ETHER_BPF_MTAP(ifp, next); /* Set the watchdog */ adapter->watchdog_timer = EM_TX_TIMEOUT; @@ -1073,7 +1078,7 @@ process: if (adapter->num_tx_desc_avail <= EM_TX_OP_THRESHOLD) ifp->if_drv_flags |= IFF_DRV_OACTIVE; - return (0); + return (error); } /* |