From 813333946c04d9e06a714d5dc3ec5cd111279105 Mon Sep 17 00:00:00 2001 From: Rafael Zalamena Date: Wed, 23 Jan 2019 10:06:49 -0200 Subject: [PATCH] ospf6d: don't queue interface events Apply interface event as soon as possible instead of queueing an event for it. Signed-off-by: Rafael Zalamena (cherry picked from commit 849576ee962518c926c6a264a497e873210941e8) --- ospf6d/ospf6_interface.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ospf6d/ospf6_interface.c b/ospf6d/ospf6_interface.c index 08922ac7bf..4916fd2e84 100644 --- a/ospf6d/ospf6_interface.c +++ b/ospf6d/ospf6_interface.c @@ -381,9 +381,9 @@ void ospf6_interface_state_update(struct interface *ifp) if (if_is_operative(ifp) && (ospf6_interface_get_linklocal_address(oi->interface) || if_is_loopback(oi->interface))) - thread_add_event(master, interface_up, oi, 0, NULL); + thread_execute(master, interface_up, oi, 0); else - thread_add_event(master, interface_down, oi, 0, NULL); + thread_execute(master, interface_down, oi, 0); return; } @@ -1791,8 +1791,8 @@ DEFUN (ipv6_ospf6_network, } /* Reset the interface */ - thread_add_event(master, interface_down, oi, 0, NULL); - thread_add_event(master, interface_up, oi, 0, NULL); + thread_execute(master, interface_down, oi, 0); + thread_execute(master, interface_up, oi, 0); return CMD_SUCCESS; } @@ -1825,8 +1825,8 @@ DEFUN (no_ipv6_ospf6_network, oi->type = type; /* Reset the interface */ - thread_add_event(master, interface_down, oi, 0, NULL); - thread_add_event(master, interface_up, oi, 0, NULL); + thread_execute(master, interface_down, oi, 0); + thread_execute(master, interface_up, oi, 0); return CMD_SUCCESS; } @@ -1969,8 +1969,8 @@ static void ospf6_interface_clear(struct vty *vty, struct interface *ifp) zlog_debug("Interface %s: clear by reset", ifp->name); /* Reset the interface */ - thread_add_event(master, interface_down, oi, 0, NULL); - thread_add_event(master, interface_up, oi, 0, NULL); + thread_execute(master, interface_down, oi, 0); + thread_execute(master, interface_up, oi, 0); } /* Clear interface */ -- 2.39.5