diff options
| author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2015-11-06 11:35:49 +0000 |
|---|---|---|
| committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2015-11-06 11:35:49 +0000 |
| commit | bb9153b1877ba83c986349fa88b6bf9f71728367 (patch) | |
| tree | 3947d9bab9d7e8307e5aeaa1f06b828b11f8328a | |
| parent | d6313450d72a4a8afa9c7a120659a1b2490bc55d (diff) | |
Use m_defrag(9) when we fail to load fragmented mbuf chains.
From Richard Procter <richard DOT n DOT procter AT gmail DOT com>.
ok dlg@
| -rw-r--r-- | sys/arch/socppc/dev/if_tsec.c | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/sys/arch/socppc/dev/if_tsec.c b/sys/arch/socppc/dev/if_tsec.c index b8a38341080..667ce15da69 100644 --- a/sys/arch/socppc/dev/if_tsec.c +++ b/sys/arch/socppc/dev/if_tsec.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_tsec.c,v 1.38 2015/10/25 13:22:09 mpi Exp $ */ +/* $OpenBSD: if_tsec.c,v 1.39 2015/11/06 11:35:48 mpi Exp $ */ /* * Copyright (c) 2008 Mark Kettenis @@ -514,7 +514,7 @@ tsec_start(struct ifnet *ifp) { struct tsec_softc *sc = ifp->if_softc; struct mbuf *m; - int idx; + int error, idx; if (!(ifp->if_flags & IFF_RUNNING)) return; @@ -531,9 +531,16 @@ tsec_start(struct ifnet *ifp) if (m == NULL) break; - if (tsec_encap(sc, m, &idx)) { + error = tsec_encap(sc, m, &idx); + if (error == ENOBUFS) { ifp->if_flags |= IFF_OACTIVE; break; + } + if (error == EFBIG) { + IFQ_DEQUEUE(&ifp->if_snd, m); + m_freem(m); /* give up: drop it */ + ifp->if_oerrors++; + continue; } /* Now we are committed to transmit the packet. */ @@ -1131,8 +1138,12 @@ tsec_encap(struct tsec_softc *sc, struct mbuf *m, int *idx) cur = frag = *idx; map = sc->sc_txbuf[cur].tb_map; - if (bus_dmamap_load_mbuf(sc->sc_dmat, map, m, BUS_DMA_NOWAIT)) - return (ENOBUFS); + if (bus_dmamap_load_mbuf(sc->sc_dmat, map, m, BUS_DMA_NOWAIT)) { + if (m_defrag(m, M_DONTWAIT)) + return (EFBIG); + if (bus_dmamap_load_mbuf(sc->sc_dmat, map, m, BUS_DMA_NOWAIT)) + return (EFBIG); + } if (map->dm_nsegs > (TSEC_NTXDESC - sc->sc_tx_cnt - 2)) { bus_dmamap_unload(sc->sc_dmat, map); |