diff options
| author |   stsp <stsp@openbsd.org> | 2020-04-02 12:25:46 +0000 |
|---|---|---|
| committer | stsp <stsp@openbsd.org> | 2020-04-02 12:25:46 +0000 |
| commit | c8da5be489292726c12f64d5327f0b886e4226bd (patch) | |
| tree | d36202bf6842d2f91ad0df18fe757f470970bf24 /sys/dev/pci | |
| parent | Remove 'done' flag from struct iwm_tx_data. Check data->m == NULL instead. (diff) | |
| download | wireguard-openbsd-c8da5be489292726c12f64d5327f0b886e4226bd.tar.xz wireguard-openbsd-c8da5be489292726c12f64d5327f0b886e4226bd.zip | |
Remove 'done' flag from struct iwx_tx_data. Check data->m == NULL instead.
No functional change.
Diffstat (limited to 'sys/dev/pci')
| -rw-r--r-- | sys/dev/pci/if_iwx.c | 10 | ||||
| -rw-r--r-- | sys/dev/pci/if_iwxvar.h | 3 |
2 files changed, 4 insertions, 9 deletions
diff --git a/sys/dev/pci/if_iwx.c b/sys/dev/pci/if_iwx.c index aa93602cce9..03327ddf90f 100644 --- a/sys/dev/pci/if_iwx.c +++ b/sys/dev/pci/if_iwx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_iwx.c,v 1.8 2020/03/31 07:27:30 stsp Exp $ */ +/* $OpenBSD: if_iwx.c,v 1.9 2020/04/02 12:25:46 stsp Exp $ */ /* * Copyright (c) 2014, 2016 genua gmbh <info@genua.de> @@ -3627,9 +3627,6 @@ iwx_txd_done(struct iwx_softc *sc, struct iwx_tx_data *txd) KASSERT(txd->in); ieee80211_release_node(ic, &txd->in->in_ni); txd->in = NULL; - - KASSERT(txd->done == 0); - txd->done = 1; } void @@ -3650,7 +3647,7 @@ iwx_rx_tx_cmd(struct iwx_softc *sc, struct iwx_rx_packet *pkt, sc->sc_tx_timer = 0; txd = &ring->data[idx]; - if (txd->done) + if (txd->m == NULL) return; iwx_rx_tx_cmd_single(sc, pkt, txd->in); @@ -3663,7 +3660,7 @@ iwx_rx_tx_cmd(struct iwx_softc *sc, struct iwx_rx_packet *pkt, */ while (ring->tail != idx) { txd = &ring->data[ring->tail]; - if (!txd->done) { + if (txd->m != NULL) { DPRINTF(("%s: missed Tx completion: tail=%d idx=%d\n", __func__, ring->tail, idx)); iwx_txd_done(sc, txd); @@ -4309,7 +4306,6 @@ iwx_tx(struct iwx_softc *sc, struct mbuf *m, struct ieee80211_node *ni, int ac) } data->m = m; data->in = in; - data->done = 0; /* Fill TX descriptor. */ num_tbs = 2 + data->map->dm_nsegs; diff --git a/sys/dev/pci/if_iwxvar.h b/sys/dev/pci/if_iwxvar.h index 761f47cacc3..92858833b29 100644 --- a/sys/dev/pci/if_iwxvar.h +++ b/sys/dev/pci/if_iwxvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_iwxvar.h,v 1.2 2020/02/28 14:17:48 stsp Exp $ */ +/* $OpenBSD: if_iwxvar.h,v 1.3 2020/04/02 12:25:46 stsp Exp $ */ /* * Copyright (c) 2014 genua mbh <info@genua.de> @@ -245,7 +245,6 @@ struct iwx_tx_data { bus_addr_t cmd_paddr; struct mbuf *m; struct iwx_node *in; - int done; }; struct iwx_tx_ring { |