diff options
| author | dim <dim@FreeBSD.org> | 2016-02-21 13:49:26 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2016-02-21 13:49:26 +0000 |
| commit | 2e1a0cbbd8f5a5ca7ec73c85311451ed1ac4242c (patch) | |
| tree | bb5f550a5fd2ee1357495987f5076839273e5998 /sys/dev/rl/if_rl.c | |
| parent | f393760a8a7c87242739a64002290b7bda94cb27 (diff) | |
| parent | 579b7ad49fdbcb4dd1e016603c5d0774b32c12d1 (diff) | |
| download | FreeBSD-src-2e1a0cbbd8f5a5ca7ec73c85311451ed1ac4242c.zip FreeBSD-src-2e1a0cbbd8f5a5ca7ec73c85311451ed1ac4242c.tar.gz | |
Merge ^/head r295601 through r295844.
Diffstat (limited to 'sys/dev/rl/if_rl.c')
| -rw-r--r-- | sys/dev/rl/if_rl.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/sys/dev/rl/if_rl.c b/sys/dev/rl/if_rl.c index 9d0d7aa..d9b7939 100644 --- a/sys/dev/rl/if_rl.c +++ b/sys/dev/rl/if_rl.c @@ -1938,15 +1938,13 @@ rl_stop(struct rl_softc *sc) */ for (i = 0; i < RL_TX_LIST_CNT; i++) { if (sc->rl_cdata.rl_tx_chain[i] != NULL) { - if (sc->rl_cdata.rl_tx_chain[i] != NULL) { - bus_dmamap_sync(sc->rl_cdata.rl_tx_tag, - sc->rl_cdata.rl_tx_dmamap[i], - BUS_DMASYNC_POSTWRITE); - bus_dmamap_unload(sc->rl_cdata.rl_tx_tag, - sc->rl_cdata.rl_tx_dmamap[i]); - m_freem(sc->rl_cdata.rl_tx_chain[i]); - sc->rl_cdata.rl_tx_chain[i] = NULL; - } + bus_dmamap_sync(sc->rl_cdata.rl_tx_tag, + sc->rl_cdata.rl_tx_dmamap[i], + BUS_DMASYNC_POSTWRITE); + bus_dmamap_unload(sc->rl_cdata.rl_tx_tag, + sc->rl_cdata.rl_tx_dmamap[i]); + m_freem(sc->rl_cdata.rl_tx_chain[i]); + sc->rl_cdata.rl_tx_chain[i] = NULL; CSR_WRITE_4(sc, RL_TXADDR0 + (i * sizeof(uint32_t)), 0x0000000); } |
