diff options
Diffstat (limited to 'zebra/zebra_nhg.c')
| -rw-r--r-- | zebra/zebra_nhg.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/zebra/zebra_nhg.c b/zebra/zebra_nhg.c index 654cf50d49..8616b14050 100644 --- a/zebra/zebra_nhg.c +++ b/zebra/zebra_nhg.c @@ -1619,7 +1619,7 @@ void zebra_nhg_free(struct nhg_hash_entry *nhe) nhe->nhg.nexthop); } - THREAD_OFF(nhe->timer); + EVENT_OFF(nhe->timer); zebra_nhg_free_members(nhe); @@ -1644,7 +1644,7 @@ void zebra_nhg_hash_free(void *p) nhe->nhg.nexthop); } - THREAD_OFF(nhe->timer); + EVENT_OFF(nhe->timer); nexthops_free(nhe->nhg.nexthop); @@ -1683,9 +1683,9 @@ void zebra_nhg_hash_free_zero_id(struct hash_bucket *b, void *arg) } } -static void zebra_nhg_timer(struct thread *thread) +static void zebra_nhg_timer(struct event *thread) { - struct nhg_hash_entry *nhe = THREAD_ARG(thread); + struct nhg_hash_entry *nhe = EVENT_ARG(thread); if (IS_ZEBRA_DEBUG_NHG_DETAIL) zlog_debug("Nexthop Timer for nhe: %pNG", nhe); @@ -1707,8 +1707,8 @@ void zebra_nhg_decrement_ref(struct nhg_hash_entry *nhe) !CHECK_FLAG(nhe->flags, NEXTHOP_GROUP_KEEP_AROUND)) { nhe->refcnt = 1; SET_FLAG(nhe->flags, NEXTHOP_GROUP_KEEP_AROUND); - thread_add_timer(zrouter.master, zebra_nhg_timer, nhe, - zrouter.nhg_keep, &nhe->timer); + event_add_timer(zrouter.master, zebra_nhg_timer, nhe, + zrouter.nhg_keep, &nhe->timer); return; } @@ -1727,8 +1727,8 @@ void zebra_nhg_increment_ref(struct nhg_hash_entry *nhe) nhe->refcnt++; - if (thread_is_scheduled(nhe->timer)) { - THREAD_OFF(nhe->timer); + if (event_is_scheduled(nhe->timer)) { + EVENT_OFF(nhe->timer); nhe->refcnt--; UNSET_FLAG(nhe->flags, NEXTHOP_GROUP_KEEP_AROUND); } @@ -3507,7 +3507,7 @@ struct nhg_hash_entry *zebra_nhg_proto_add(uint32_t id, int type, /* Dont call the dec API, we dont want to uninstall the ID */ old->refcnt = 0; - THREAD_OFF(old->timer); + EVENT_OFF(old->timer); zebra_nhg_free(old); old = NULL; } |