diff options
| author |   visa <visa@openbsd.org> | 2019-04-15 03:26:55 +0000 |
|---|---|---|
| committer | visa <visa@openbsd.org> | 2019-04-15 03:26:55 +0000 |
| commit | c87f73dd353d25ed9f55f415cb8945353a4cbb65 (patch) | |
| tree | afd6cd63e4ace8a43ca42d1eee3c19bdbe61b095 /sys/dev/pci | |
| parent | basic support for dumping xfp info (diff) | |
| download | wireguard-openbsd-c87f73dd353d25ed9f55f415cb8945353a4cbb65.tar.xz wireguard-openbsd-c87f73dd353d25ed9f55f415cb8945353a4cbb65.zip | |
Use timeout_del_barrier(9) instead of timeout_del(9) followed by
conditional timeout_barrier(9).
OK kn@ dlg@
Diffstat (limited to 'sys/dev/pci')
| -rw-r--r-- | sys/dev/pci/if_ixl.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sys/dev/pci/if_ixl.c b/sys/dev/pci/if_ixl.c index 9f175344af8..6cbf33b65c9 100644 --- a/sys/dev/pci/if_ixl.c +++ b/sys/dev/pci/if_ixl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ixl.c,v 1.36 2019/04/10 13:56:09 phessler Exp $ */ +/* $OpenBSD: if_ixl.c,v 1.37 2019/04/15 03:26:55 visa Exp $ */ /* * Copyright (c) 2013-2015, Intel Corporation @@ -2047,8 +2047,7 @@ ixl_down(struct ixl_softc *sc) ifq_barrier(ifp->if_ifqs[i]); - if (!timeout_del(&rxr->rxr_refill)) - timeout_barrier(&rxr->rxr_refill); + timeout_del_barrier(&rxr->rxr_refill); } /* XXX wait at least 400 usec for all tx queues in one go */ @@ -2544,8 +2543,7 @@ ixl_rxr_clean(struct ixl_softc *sc, struct ixl_rx_ring *rxr) bus_dmamap_t map; unsigned int i; - if (!timeout_del(&rxr->rxr_refill)) - timeout_barrier(&rxr->rxr_refill); + timeout_del_barrier(&rxr->rxr_refill); maps = rxr->rxr_maps; for (i = 0; i < sc->sc_rx_ring_ndescs; i++) { |