d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove some spurious debugging, and use more complete error handling for

Browse Source 
tx load and fragmentation problems.
This commit is contained in:
Scott Long 2006-10-19 06:58:01 +00:00
parent 034f5f8e72
commit ae4991a54c
1 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
sys/dev/bce/if_bce.c
View File

@ -4563,28 +4563,38 @@ bce_tx_encap(struct bce_softc *sc, struct mbuf **m_head)
if (error == EFBIG) {
/* Try to defrag the mbuf if there are too many segments. */
printf("bce: need to defrag\n");
DBPRINT(sc, BCE_WARN, "%s(): fragmented mbuf (%d pieces)\n",
__FUNCTION__, map_arg.maxsegs);
m0 = m_defrag(*m_head, M_DONTWAIT);
if (m0 != NULL) {
*m_head = m0;
error = bus_dmamap_load_mbuf_sg(sc->tx_mbuf_tag,
map, m0, segs, &nsegs, BUS_DMA_NOWAIT);
}
/* Still getting an error after a defrag. */
if (error) {
printf("bce: defrag failed\n");
BCE_PRINTF(sc,
"%s(%d): Error mapping mbuf into TX chain!\n",
__FILE__, __LINE__);
if (m0 == NULL) {
m_freem(*m_head);
*m_head = NULL;
return (ENOBUFS);
}
} else if (error != 0)
*m_head = m0;
error = bus_dmamap_load_mbuf_sg(sc->tx_mbuf_tag, map, m0,
segs, &nsegs, BUS_DMA_NOWAIT);
/* Still getting an error after a defrag. */
if (error == ENOMEM) {
return (error);
} else if (error != 0) {
BCE_PRINTF(sc,
"%s(%d): Error mapping mbuf into TX chain!\n",
__FILE__, __LINE__);
m_freem(m0);
*m_head = NULL;
return (ENOBUFS);
}
} else if (error == ENOMEM) {
return (error);
} else if (error != 0) {
m_freem(m0);
*m_head = NULL;
return (error);
}
/* prod points to an empty tx_bd at this point. */