diff options
| author |   stsp <stsp@openbsd.org> | 2020-04-02 12:25:21 +0000 |
|---|---|---|
| committer | stsp <stsp@openbsd.org> | 2020-04-02 12:25:21 +0000 |
| commit | bb07e34fd37769ca80c782617d6ade29d4840a74 (patch) | |
| tree | 28654380fc86d366be7a8bd241d6e26da9d07d16 | |
| parent | Use fopen() and BIO_new_fd() instead of BIO_new_file so that a possible (diff) | |
| download | wireguard-openbsd-bb07e34fd37769ca80c782617d6ade29d4840a74.tar.xz wireguard-openbsd-bb07e34fd37769ca80c782617d6ade29d4840a74.zip | |
Remove 'done' flag from struct iwm_tx_data. Check data->m == NULL instead.
No functional change.
| -rw-r--r-- | sys/dev/pci/if_iwm.c | 10 | ||||
| -rw-r--r-- | sys/dev/pci/if_iwmvar.h | 3 |
2 files changed, 4 insertions, 9 deletions
diff --git a/sys/dev/pci/if_iwm.c b/sys/dev/pci/if_iwm.c index 293b8f57cd7..2b3c60404a2 100644 --- a/sys/dev/pci/if_iwm.c +++ b/sys/dev/pci/if_iwm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_iwm.c,v 1.302 2020/03/31 11:32:43 stsp Exp $ */ +/* $OpenBSD: if_iwm.c,v 1.303 2020/04/02 12:25:21 stsp Exp $ */ /* * Copyright (c) 2014, 2016 genua gmbh <info@genua.de> @@ -4234,9 +4234,6 @@ iwm_txd_done(struct iwm_softc *sc, struct iwm_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 @@ -4257,7 +4254,7 @@ iwm_rx_tx_cmd(struct iwm_softc *sc, struct iwm_rx_packet *pkt, sc->sc_tx_timer = 0; txd = &ring->data[idx]; - if (txd->done) + if (txd->m == NULL) return; iwm_rx_tx_cmd_single(sc, pkt, txd->in); @@ -4270,7 +4267,7 @@ iwm_rx_tx_cmd(struct iwm_softc *sc, struct iwm_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)); iwm_txd_done(sc, txd); @@ -4990,7 +4987,6 @@ iwm_tx(struct iwm_softc *sc, struct mbuf *m, struct ieee80211_node *ni, int ac) } data->m = m; data->in = in; - data->done = 0; /* Fill TX descriptor. */ desc->num_tbs = 2 + data->map->dm_nsegs; diff --git a/sys/dev/pci/if_iwmvar.h b/sys/dev/pci/if_iwmvar.h index ec579e3f750..1192da0f222 100644 --- a/sys/dev/pci/if_iwmvar.h +++ b/sys/dev/pci/if_iwmvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_iwmvar.h,v 1.51 2020/02/28 13:26:56 stsp Exp $ */ +/* $OpenBSD: if_iwmvar.h,v 1.52 2020/04/02 12:25:21 stsp Exp $ */ /* * Copyright (c) 2014 genua mbh <info@genua.de> @@ -258,7 +258,6 @@ struct iwm_tx_data { bus_addr_t scratch_paddr; struct mbuf *m; struct iwm_node *in; - int done; }; struct iwm_tx_ring { |