diff options
| author | John Baldwin <jhb@FreeBSD.org> | 2014-06-11 14:53:58 +0000 |
|---|---|---|
| committer | John Baldwin <jhb@FreeBSD.org> | 2014-06-11 14:53:58 +0000 |
| commit | 068d8643adb13434b57fdd5febf43a11194d508f (patch) | |
| tree | 5544dcfb2be4391a29657081ad30163d6c502e86 /sys/dev/jme | |
| parent | 4f655310bff3d8052e35426ad6188a81147a7ed9 (diff) | |
Notes
Diffstat (limited to 'sys/dev/jme')
| -rw-r--r-- | sys/dev/jme/if_jme.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/sys/dev/jme/if_jme.c b/sys/dev/jme/if_jme.c index c3f6bf4b91c9..dd7554015867 100644 --- a/sys/dev/jme/if_jme.c +++ b/sys/dev/jme/if_jme.c @@ -1408,31 +1408,29 @@ jme_dma_free(struct jme_softc *sc) /* Tx ring */ if (sc->jme_cdata.jme_tx_ring_tag != NULL) { - if (sc->jme_cdata.jme_tx_ring_map) + if (sc->jme_rdata.jme_tx_ring_paddr) bus_dmamap_unload(sc->jme_cdata.jme_tx_ring_tag, sc->jme_cdata.jme_tx_ring_map); - if (sc->jme_cdata.jme_tx_ring_map && - sc->jme_rdata.jme_tx_ring) + if (sc->jme_rdata.jme_tx_ring) bus_dmamem_free(sc->jme_cdata.jme_tx_ring_tag, sc->jme_rdata.jme_tx_ring, sc->jme_cdata.jme_tx_ring_map); sc->jme_rdata.jme_tx_ring = NULL; - sc->jme_cdata.jme_tx_ring_map = NULL; + sc->jme_rdata.jme_tx_ring_paddr = 0; bus_dma_tag_destroy(sc->jme_cdata.jme_tx_ring_tag); sc->jme_cdata.jme_tx_ring_tag = NULL; } /* Rx ring */ if (sc->jme_cdata.jme_rx_ring_tag != NULL) { - if (sc->jme_cdata.jme_rx_ring_map) + if (sc->jme_rdata.jme_rx_ring_paddr) bus_dmamap_unload(sc->jme_cdata.jme_rx_ring_tag, sc->jme_cdata.jme_rx_ring_map); - if (sc->jme_cdata.jme_rx_ring_map && - sc->jme_rdata.jme_rx_ring) + if (sc->jme_rdata.jme_rx_ring) bus_dmamem_free(sc->jme_cdata.jme_rx_ring_tag, sc->jme_rdata.jme_rx_ring, sc->jme_cdata.jme_rx_ring_map); sc->jme_rdata.jme_rx_ring = NULL; - sc->jme_cdata.jme_rx_ring_map = NULL; + sc->jme_rdata.jme_rx_ring_paddr = 0; bus_dma_tag_destroy(sc->jme_cdata.jme_rx_ring_tag); sc->jme_cdata.jme_rx_ring_tag = NULL; } @@ -1470,15 +1468,15 @@ jme_dma_free(struct jme_softc *sc) /* Shared status block. */ if (sc->jme_cdata.jme_ssb_tag != NULL) { - if (sc->jme_cdata.jme_ssb_map) + if (sc->jme_rdata.jme_ssb_block_paddr) bus_dmamap_unload(sc->jme_cdata.jme_ssb_tag, sc->jme_cdata.jme_ssb_map); - if (sc->jme_cdata.jme_ssb_map && sc->jme_rdata.jme_ssb_block) + if (sc->jme_rdata.jme_ssb_block) bus_dmamem_free(sc->jme_cdata.jme_ssb_tag, sc->jme_rdata.jme_ssb_block, sc->jme_cdata.jme_ssb_map); sc->jme_rdata.jme_ssb_block = NULL; - sc->jme_cdata.jme_ssb_map = NULL; + sc->jme_rdata.jme_ssb_block_paddr = 0; bus_dma_tag_destroy(sc->jme_cdata.jme_ssb_tag); sc->jme_cdata.jme_ssb_tag = NULL; } |