diff options
Diffstat (limited to 'sys/dev/pci/if_age.c')
| -rw-r--r-- | sys/dev/pci/if_age.c | 29 |
1 files changed, 2 insertions, 27 deletions
diff --git a/sys/dev/pci/if_age.c b/sys/dev/pci/if_age.c index 523c8d2d799..a0b51596af4 100644 --- a/sys/dev/pci/if_age.c +++ b/sys/dev/pci/if_age.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_age.c,v 1.6 2009/07/28 13:53:56 kevlo Exp $ */ +/* $OpenBSD: if_age.c,v 1.7 2009/09/13 14:42:52 krw Exp $ */ /*- * Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org> @@ -1168,43 +1168,18 @@ age_encap(struct age_softc *sc, struct mbuf **m_head) error = EFBIG; } if (error == EFBIG) { - error = 0; - - MGETHDR(m, M_DONTWAIT, MT_DATA); - if (m == NULL) { + if (m_defrag(*m_head, M_DONTWAIT)) { printf("%s: can't defrag TX mbuf\n", sc->sc_dev.dv_xname); m_freem(*m_head); *m_head = NULL; return (ENOBUFS); } - - M_DUP_PKTHDR(m, *m_head); - if ((*m_head)->m_pkthdr.len > MHLEN) { - MCLGET(m, M_DONTWAIT); - if (!(m->m_flags & M_EXT)) { - m_freem(*m_head); - m_freem(m); - *m_head = NULL; - return (ENOBUFS); - } - } - m_copydata(*m_head, 0, (*m_head)->m_pkthdr.len, - mtod(m, caddr_t)); - m_freem(*m_head); - m->m_len = m->m_pkthdr.len; - *m_head = m; - error = bus_dmamap_load_mbuf(sc->sc_dmat, map, *m_head, BUS_DMA_NOWAIT); - if (error != 0) { printf("%s: could not load defragged TX mbuf\n", sc->sc_dev.dv_xname); - if (!error) { - bus_dmamap_unload(sc->sc_dmat, map); - error = EFBIG; - } m_freem(*m_head); *m_head = NULL; return (error); |