diff options
| author | Renato Westphal <renato@cvs.openbsd.org> | 2016-05-23 16:23:07 +0000 |
|---|---|---|
| committer | Renato Westphal <renato@cvs.openbsd.org> | 2016-05-23 16:23:07 +0000 |
| commit | 32a858406ee5ae0daa73cd361135ccfd4cf0cee3 (patch) | |
| tree | fe64cbe78a3ebce21e630753c24e85d08b70ccd2 /usr.sbin/ldpd/neighbor.c | |
| parent | 4f44db979ad33b647bb035c55fff7e4a2c89409c (diff) | |
Reuse nbr_pending_connect() on nbr_del().
Diffstat (limited to 'usr.sbin/ldpd/neighbor.c')
| -rw-r--r-- | usr.sbin/ldpd/neighbor.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/ldpd/neighbor.c b/usr.sbin/ldpd/neighbor.c index 4341003fbc3..19d49c0fdbe 100644 --- a/usr.sbin/ldpd/neighbor.c +++ b/usr.sbin/ldpd/neighbor.c @@ -1,4 +1,4 @@ -/* $OpenBSD: neighbor.c,v 1.62 2016/05/23 16:20:59 renato Exp $ */ +/* $OpenBSD: neighbor.c,v 1.63 2016/05/23 16:23:06 renato Exp $ */ /* * Copyright (c) 2009 Michele Marchetto <michele@openbsd.org> @@ -277,7 +277,7 @@ nbr_del(struct nbr *nbr) nbr_fsm(nbr, NBR_EVT_CLOSE_SESSION); pfkey_remove(nbr); - if (event_pending(&nbr->ev_connect, EV_WRITE, NULL)) + if (nbr_pending_connect(nbr)) event_del(&nbr->ev_connect); nbr_stop_ktimer(nbr); nbr_stop_ktimeout(nbr); |