summaryrefslogtreecommitdiff
path: root/ospfd/ospfd.c
diff options
context:
space:
mode:
Diffstat (limited to 'ospfd/ospfd.c')
-rw-r--r--ospfd/ospfd.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/ospfd/ospfd.c b/ospfd/ospfd.c
index ce3bc33c1a..3718f82c05 100644
--- a/ospfd/ospfd.c
+++ b/ospfd/ospfd.c
@@ -1324,10 +1324,7 @@ void ospf_ls_upd_queue_empty(struct ospf_interface *oi)
}
/* remove update event */
- if (oi->t_ls_upd_event) {
- thread_cancel(oi->t_ls_upd_event);
- oi->t_ls_upd_event = NULL;
- }
+ thread_cancel(&oi->t_ls_upd_event);
}
void ospf_if_update(struct ospf *ospf, struct interface *ifp)
@@ -2158,7 +2155,7 @@ static int ospf_vrf_disable(struct vrf *vrf)
if (IS_DEBUG_OSPF_EVENT)
zlog_debug("%s: ospf old_vrf_id %d unlinked", __func__,
old_vrf_id);
- thread_cancel(ospf->t_read);
+ thread_cancel(&ospf->t_read);
close(ospf->fd);
ospf->fd = -1;
}