Author: yongari
Date: Wed Jan 18 02:22:07 2017
New Revision: 312363
URL: https://svnweb.freebsd.org/changeset/base/312363
Log:
MFC r295736,295738:
r295736:
Remove duplicated check.
r295738:
Fix a bug introduced in r295736
TX descriptor address should be updated for valid chain.
Modified:
stable/10/sys/dev/rl/if_rl.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/dev/rl/if_rl.c
==============================================================================
--- stable/10/sys/dev/rl/if_rl.c Wed Jan 18 02:16:17 2017
(r312362)
+++ stable/10/sys/dev/rl/if_rl.c Wed Jan 18 02:22:07 2017
(r312363)
@@ -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);
}
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
