Page MenuHomeFreeBSD
Files F145746412

D55420.diff
No OneTemporary
Actions

D55420.diff
View Options

diff --git a/sys/dev/rge/if_rge.c b/sys/dev/rge/if_rge.c
--- a/sys/dev/rge/if_rge.c
+++ b/sys/dev/rge/if_rge.c
@@ -1762,13 +1762,6 @@
RGE_ASSERT_UNLOCKED(sc);
- /* TX desc */
- bus_dmamap_unload(sc->sc_dmat_tx_desc, q->q_tx.rge_tx_list_map);
- if (q->q_tx.rge_tx_list != NULL)
- bus_dmamem_free(sc->sc_dmat_tx_desc, q->q_tx.rge_tx_list,
- q->q_tx.rge_tx_list_map);
- memset(&q->q_tx, 0, sizeof(q->q_tx));
-
/* TX buf */
for (i = 0; i < RGE_TX_LIST_CNT; i++) {
struct rge_txq *tx = &q->q_tx.rge_txq[i];
@@ -1800,12 +1793,13 @@
}
}
- /* RX desc */
- bus_dmamap_unload(sc->sc_dmat_rx_desc, q->q_rx.rge_rx_list_map);
- if (q->q_rx.rge_rx_list != 0)
- bus_dmamem_free(sc->sc_dmat_rx_desc, q->q_rx.rge_rx_list,
- q->q_rx.rge_rx_list_map);
- memset(&q->q_rx, 0, sizeof(q->q_tx));
+ /* TX desc */
+ if (q->q_tx.rge_tx_list != NULL) {
+ bus_dmamap_unload(sc->sc_dmat_tx_desc, q->q_tx.rge_tx_list_map);
+ bus_dmamem_free(sc->sc_dmat_tx_desc, q->q_tx.rge_tx_list,
+ q->q_tx.rge_tx_list_map);
+ }
+ memset(&q->q_tx, 0, sizeof(q->q_tx));
/* RX buf */
for (i = 0; i < RGE_RX_LIST_CNT; i++) {
@@ -1830,6 +1824,14 @@
}
}
+ /* RX desc */
+ if (q->q_rx.rge_rx_list != NULL) {
+ bus_dmamap_unload(sc->sc_dmat_rx_desc, q->q_rx.rge_rx_list_map);
+ bus_dmamem_free(sc->sc_dmat_rx_desc, q->q_rx.rge_rx_list,
+ q->q_rx.rge_rx_list_map);
+ }
+ memset(&q->q_rx, 0, sizeof(q->q_tx));
+
return (0);
}
@@ -1845,9 +1847,10 @@
RGE_ASSERT_UNLOCKED(sc);
- bus_dmamap_unload(sc->sc_dmat_stats_buf, ss->map);
- if (ss->stats != NULL)
+ if (ss->stats != NULL) {
+ bus_dmamap_unload(sc->sc_dmat_stats_buf, ss->map);
bus_dmamem_free(sc->sc_dmat_stats_buf, ss->stats, ss->map);
+ }
memset(ss, 0, sizeof(*ss));
return (0);
}

File Metadata

Mime Type
text/plain
Expires
Tue, Feb 24, 9:53 PM (12 h, 2 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28942286
Default Alt Text
D55420.diff (1 KB)

Event Timeline