diff options
| -rw-r--r-- | sys/dev/pci/if_ixl.c | 8 | ||||
| -rw-r--r-- | sys/net/if_bridge.c | 5 | ||||
| -rw-r--r-- | sys/net/if_gre.c | 17 |
3 files changed, 11 insertions, 19 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++) { diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c index 8f0260870f1..a1ba46f8581 100644 --- a/sys/net/if_bridge.c +++ b/sys/net/if_bridge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_bridge.c,v 1.326 2019/03/31 13:59:38 mpi Exp $ */ +/* $OpenBSD: if_bridge.c,v 1.327 2019/04/15 03:26:55 visa Exp $ */ /* * Copyright (c) 1999, 2000 Jason L. Wright (jason@thought.net) @@ -692,8 +692,7 @@ bridge_stop(struct bridge_softc *sc) CLR(ifp->if_flags, IFF_RUNNING); - if (!timeout_del(&sc->sc_brtimeout)) - timeout_barrier(&sc->sc_brtimeout); + timeout_del_barrier(&sc->sc_brtimeout); bridge_rtflush(sc, IFBF_FLUSHDYN); } diff --git a/sys/net/if_gre.c b/sys/net/if_gre.c index 550672c03df..5521e683fe4 100644 --- a/sys/net/if_gre.c +++ b/sys/net/if_gre.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_gre.c,v 1.145 2019/01/04 11:16:03 benno Exp $ */ +/* $OpenBSD: if_gre.c,v 1.146 2019/04/15 03:26:55 visa Exp $ */ /* $NetBSD: if_gre.c,v 1.9 1999/10/25 19:18:11 drochner Exp $ */ /* @@ -3018,10 +3018,8 @@ gre_down(struct gre_softc *sc) CLR(sc->sc_if.if_flags, IFF_RUNNING); if (sc->sc_ka_state != GRE_KA_NONE) { - if (!timeout_del(&sc->sc_ka_hold)) - timeout_barrier(&sc->sc_ka_hold); - if (!timeout_del(&sc->sc_ka_send)) - timeout_barrier(&sc->sc_ka_send); + timeout_del_barrier(&sc->sc_ka_hold); + timeout_del_barrier(&sc->sc_ka_send); sc->sc_ka_state = GRE_KA_DOWN; gre_link_state(&sc->sc_if, sc->sc_ka_state); @@ -3617,8 +3615,7 @@ nvgre_down(struct nvgre_softc *sc) CLR(ifp->if_flags, IFF_RUNNING); NET_UNLOCK(); - if (!timeout_del(&sc->sc_ether_age)) - timeout_barrier(&sc->sc_ether_age); + timeout_del_barrier(&sc->sc_ether_age); ifq_barrier(&ifp->if_snd); if (!task_del(softnet, &sc->sc_send_task)) taskq_barrier(softnet); @@ -3924,10 +3921,8 @@ eoip_down(struct eoip_softc *sc) CLR(sc->sc_ac.ac_if.if_flags, IFF_RUNNING); if (sc->sc_ka_state != GRE_KA_NONE) { - if (!timeout_del(&sc->sc_ka_hold)) - timeout_barrier(&sc->sc_ka_hold); - if (!timeout_del(&sc->sc_ka_send)) - timeout_barrier(&sc->sc_ka_send); + timeout_del_barrier(&sc->sc_ka_hold); + timeout_del_barrier(&sc->sc_ka_send); sc->sc_ka_state = GRE_KA_DOWN; gre_link_state(&sc->sc_ac.ac_if, sc->sc_ka_state); |