diff options
| author |   claudio <claudio@openbsd.org> | 2021-01-19 10:09:59 +0000 |
|---|---|---|
| committer | claudio <claudio@openbsd.org> | 2021-01-19 10:09:59 +0000 |
| commit | 8654e9c5ecf3557e13de4389e6a801aec0763ce0 (patch) | |
| tree | 3c4a6be3feb3695f57deb9925531fe8cb92dfe74 /usr.sbin/ripd/interface.c | |
| parent | Like in ospfd make the pkt_ptr a local static buffer. (diff) | |
| download | wireguard-openbsd-8654e9c5ecf3557e13de4389e6a801aec0763ce0.tar.xz wireguard-openbsd-8654e9c5ecf3557e13de4389e6a801aec0763ce0.zip | |
Move the interface demote out of if_del and into the only place where
it is needed (the if_del call in ripe.c). With this the ripd_process
check in ripe_demote_iface() can be removed.
Diffstat (limited to 'usr.sbin/ripd/interface.c')
| -rw-r--r-- | usr.sbin/ripd/interface.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/usr.sbin/ripd/interface.c b/usr.sbin/ripd/interface.c index a176e1368cc..3d1dfd611bc 100644 --- a/usr.sbin/ripd/interface.c +++ b/usr.sbin/ripd/interface.c @@ -1,4 +1,4 @@ -/* $OpenBSD: interface.c,v 1.15 2019/06/28 13:32:50 deraadt Exp $ */ +/* $OpenBSD: interface.c,v 1.16 2021/01/19 10:09:59 claudio Exp $ */ /* * Copyright (c) 2006 Michele Marchetto <mydecay@openbeer.it> @@ -461,10 +461,6 @@ if_del(struct iface *iface) log_debug("if_del: interface %s", iface->name); - /* revert the demotion when the interface is deleted */ - if (iface->state == IF_STA_DOWN) - ripe_demote_iface(iface, 1); - /* clear lists etc */ while ((nbr = LIST_FIRST(&iface->nbr_list)) != NULL) nbr_del(nbr); |