diff options
| author |   jmatthew <jmatthew@openbsd.org> | 2020-04-20 12:11:17 +0000 |
|---|---|---|
| committer | jmatthew <jmatthew@openbsd.org> | 2020-04-20 12:11:17 +0000 |
| commit | 9b18b542052d5e55735a9776c011160d76b4a221 (patch) | |
| tree | ad50280e45628017d78fa9d2d89829eed165ca6d | |
| parent | Strip the 'in bgpd' in the title of the rpki-client man page. (diff) | |
| download | wireguard-openbsd-9b18b542052d5e55735a9776c011160d76b4a221.tar.xz wireguard-openbsd-9b18b542052d5e55735a9776c011160d76b4a221.zip | |
Don't call mcx_intr() from mcx_cmdq_poll(); this was a leftover from early
development that I forgot about, but turns out to be a potential race with
the actual interrupt handler.
ok dlg@
| -rw-r--r-- | sys/dev/pci/if_mcx.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sys/dev/pci/if_mcx.c b/sys/dev/pci/if_mcx.c index adbf625adfe..6e7ace6aae1 100644 --- a/sys/dev/pci/if_mcx.c +++ b/sys/dev/pci/if_mcx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_mcx.c,v 1.39 2020/04/06 11:27:23 jmatthew Exp $ */ +/* $OpenBSD: if_mcx.c,v 1.40 2020/04/20 12:11:17 jmatthew Exp $ */ /* * Copyright (c) 2017 David Gwynne <dlg@openbsd.org> @@ -2450,11 +2450,8 @@ mcx_cmdq_poll(struct mcx_softc *sc, struct mcx_cmdq_entry *cqe, 0, MCX_DMA_LEN(&sc->sc_cmdq_mem), BUS_DMASYNC_POSTRW); if ((cqe->cq_status & MCX_CQ_STATUS_OWN_MASK) == - MCX_CQ_STATUS_OWN_SW) { - if (sc->sc_eqn != 0) - mcx_intr(sc); + MCX_CQ_STATUS_OWN_SW) return (0); - } delay(1000); } |