diff options
| author |   dlg <dlg@openbsd.org> | 2013-12-24 01:11:04 +0000 |
|---|---|---|
| committer | dlg <dlg@openbsd.org> | 2013-12-24 01:11:04 +0000 |
| commit | 52fe8a0ecd04ae80559997b70fc1e63202eefabf (patch) | |
| tree | f07b1dc0774b458bdf09b1f0624a2b34b4cb4648 /sys/arch/sparc | |
| parent | rename local ticks to nticks to avoid aliasing global. ok krw (diff) | |
| download | wireguard-openbsd-52fe8a0ecd04ae80559997b70fc1e63202eefabf.tar.xz wireguard-openbsd-52fe8a0ecd04ae80559997b70fc1e63202eefabf.zip | |
get rid of if (timeout_pending()) timeout_del(). this is racy. any
conditionals you did on timeout_pending can now be done on timeout_del
now that it returns what it did.
ok and a very good fix from kettenis@
Diffstat (limited to 'sys/arch/sparc')
| -rw-r--r-- | sys/arch/sparc/dev/be.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/arch/sparc/dev/be.c b/sys/arch/sparc/dev/be.c index 7a28147cd6e..97b07758c60 100644 --- a/sys/arch/sparc/dev/be.c +++ b/sys/arch/sparc/dev/be.c @@ -1,4 +1,4 @@ -/* $OpenBSD: be.c,v 1.45 2013/11/27 08:56:31 mpi Exp $ */ +/* $OpenBSD: be.c,v 1.46 2013/12/24 01:11:04 dlg Exp $ */ /* * Copyright (c) 1998 Theo de Raadt and Jason L. Wright. @@ -323,8 +323,7 @@ bestop(sc) int tries; sc->sc_arpcom.ac_if.if_timer = 0; - if (timeout_pending(&sc->sc_tick)) - timeout_del(&sc->sc_tick); + timeout_del(&sc->sc_tick); tries = 32; sc->sc_br->tx_cfg = 0; |