diff options
| author | Michael Knudsen <mk@cvs.openbsd.org> | 2008-05-21 21:10:51 +0000 |
|---|---|---|
| committer | Michael Knudsen <mk@cvs.openbsd.org> | 2008-05-21 21:10:51 +0000 |
| commit | c226c53ab9969e2bd8349fe4931a06fa432be035 (patch) | |
| tree | 468784959c59e437bca4f56f3212247fd53a10e6 /sys | |
| parent | 715515a321c753028cfddd435287eef6918c3da2 (diff) | |
Just clear the timeout since timeout_del() can cope with
unscheduled/already triggered timeouts.
ok brad claudio
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/net/bridgestp.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/net/bridgestp.c b/sys/net/bridgestp.c index 4d453eca00b..7d0f11b8fb5 100644 --- a/sys/net/bridgestp.c +++ b/sys/net/bridgestp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bridgestp.c,v 1.31 2008/05/07 13:45:35 dlg Exp $ */ +/* $OpenBSD: bridgestp.c,v 1.32 2008/05/21 21:10:50 mk Exp $ */ /* * Copyright (c) 2000 Jason L. Wright (jason@thought.net) @@ -1986,8 +1986,7 @@ bstp_stop(struct bstp_state *bs) LIST_FOREACH(bp, &bs->bs_bplist, bp_next) bstp_set_port_state(bp, BSTP_IFSTATE_DISCARDING); - if (timeout_initialized(&bs->bs_bstptimeout) && - timeout_pending(&bs->bs_bstptimeout)) + if (timeout_initialized(&bs->bs_bstptimeout)) timeout_del(&bs->bs_bstptimeout); } |