svn commit: r197096 - in stable/7/sys: . contrib/pf dev/alc
Pyun YongHyeon
yongari at FreeBSD.org
Fri Sep 11 17:18:08 UTC 2009
Author: yongari
Date: Fri Sep 11 17:18:08 2009
New Revision: 197096
URL: http://svn.freebsd.org/changeset/base/197096
Log:
MFC r195989:
Free allocated Rx ring dma memory/tags.
Modified:
stable/7/sys/ (props changed)
stable/7/sys/contrib/pf/ (props changed)
stable/7/sys/dev/alc/if_alc.c
Modified: stable/7/sys/dev/alc/if_alc.c
==============================================================================
--- stable/7/sys/dev/alc/if_alc.c Fri Sep 11 17:15:18 2009 (r197095)
+++ stable/7/sys/dev/alc/if_alc.c Fri Sep 11 17:18:08 2009 (r197096)
@@ -1501,6 +1501,21 @@ alc_dma_free(struct alc_softc *sc)
bus_dma_tag_destroy(sc->alc_cdata.alc_tx_ring_tag);
sc->alc_cdata.alc_tx_ring_tag = NULL;
}
+ /* Rx ring. */
+ if (sc->alc_cdata.alc_rx_ring_tag != NULL) {
+ if (sc->alc_cdata.alc_rx_ring_map != NULL)
+ bus_dmamap_unload(sc->alc_cdata.alc_rx_ring_tag,
+ sc->alc_cdata.alc_rx_ring_map);
+ if (sc->alc_cdata.alc_rx_ring_map != NULL &&
+ sc->alc_rdata.alc_rx_ring != NULL)
+ bus_dmamem_free(sc->alc_cdata.alc_rx_ring_tag,
+ sc->alc_rdata.alc_rx_ring,
+ sc->alc_cdata.alc_rx_ring_map);
+ sc->alc_rdata.alc_rx_ring = NULL;
+ sc->alc_cdata.alc_rx_ring_map = NULL;
+ bus_dma_tag_destroy(sc->alc_cdata.alc_rx_ring_tag);
+ sc->alc_cdata.alc_rx_ring_tag = NULL;
+ }
/* Rx return ring. */
if (sc->alc_cdata.alc_rr_ring_tag != NULL) {
if (sc->alc_cdata.alc_rr_ring_map != NULL)
More information about the svn-src-stable-7
mailing list