diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2009-01-30 10:44:57 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2009-01-30 10:44:57 +0000 |
| commit | b70b43a89738bd0bd87a48b6266ef3cc91848910 (patch) | |
| tree | e301af8cf8de6141aa170bcd92e962625ea00596 /sys/arch | |
| parent | 0827fc0116d552147ac67ddb1da20fc37bad6d7d (diff) | |
Properly clean out our rings when we down the interface.
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/socppc/dev/if_tsec.c | 29 |
1 files changed, 28 insertions, 1 deletions
diff --git a/sys/arch/socppc/dev/if_tsec.c b/sys/arch/socppc/dev/if_tsec.c index fed717e54c8..fc8367164f7 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.17 2009/01/29 12:37:49 kettenis Exp $ */ +/* $OpenBSD: if_tsec.c,v 1.18 2009/01/30 10:44:56 kettenis Exp $ */ /* * Copyright (c) 2008 Mark Kettenis @@ -912,7 +912,9 @@ void tsec_down(struct tsec_softc *sc) { struct ifnet *ifp = &sc->sc_ac.ac_if; + struct tsec_buf *txb, *rxb; uint32_t maccfg1; + int i; timeout_del(&sc->sc_tick); @@ -926,8 +928,33 @@ tsec_down(struct tsec_softc *sc) maccfg1 &= ~TSEC_MACCFG1_RXEN; tsec_write(sc, TSEC_MACCFG1, maccfg1); + for (i = 0; i < TSEC_NTXDESC; i++) { + txb = &sc->sc_txbuf[i]; + if (txb->tb_m) { + bus_dmamap_sync(sc->sc_dmat, txb->tb_map, 0, + txb->tb_map->dm_mapsize, BUS_DMASYNC_POSTWRITE); + bus_dmamap_unload(sc->sc_dmat, txb->tb_map); + m_freem(txb->tb_m); + } + bus_dmamap_destroy(sc->sc_dmat, txb->tb_map); + } + tsec_dmamem_free(sc, sc->sc_txring); free (sc->sc_txbuf, M_DEVBUF); + + for (i = 0; i < TSEC_NRXDESC; i++) { + rxb = &sc->sc_rxbuf[i]; + if (rxb->tb_m) { + bus_dmamap_sync(sc->sc_dmat, rxb->tb_map, 0, + rxb->tb_map->dm_mapsize, BUS_DMASYNC_POSTREAD); + bus_dmamap_unload(sc->sc_dmat, rxb->tb_map); + m_freem(rxb->tb_m); + } + bus_dmamap_destroy(sc->sc_dmat, rxb->tb_map); + } + + tsec_dmamem_free(sc, sc->sc_rxring); + free(sc->sc_rxbuf, M_DEVBUF); } void |