diff options
| author | yongari <yongari@FreeBSD.org> | 2017-01-18 02:22:07 +0000 |
|---|---|---|
| committer | yongari <yongari@FreeBSD.org> | 2017-01-18 02:22:07 +0000 |
| commit | 9029729f6dcd849cd2028024ba85208a6947e6fe (patch) | |
| tree | ff8e01fb9bbee387402802c2e10bb8947951619a | |
| parent | a0a0a207f777866db57138228016d9bbbc0d0a9c (diff) | |
| download | FreeBSD-src-9029729f6dcd849cd2028024ba85208a6947e6fe.zip FreeBSD-src-9029729f6dcd849cd2028024ba85208a6947e6fe.tar.gz | |
MFC r295736,295738:
r295736:
Remove duplicated check.
r295738:
Fix a bug introduced in r295736
TX descriptor address should be updated for valid chain.
| -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 2ff1310..2f877c9 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); } |
