diff options
Diffstat (limited to 'bgpd/rfapi/rfapi_rib.c')
| -rw-r--r-- | bgpd/rfapi/rfapi_rib.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/bgpd/rfapi/rfapi_rib.c b/bgpd/rfapi/rfapi_rib.c index 3febea96bb..4dc3139ed1 100644 --- a/bgpd/rfapi/rfapi_rib.c +++ b/bgpd/rfapi/rfapi_rib.c @@ -255,8 +255,8 @@ static void rfapi_info_free(struct rfapi_info *goner) if (goner->timer) { struct rfapi_rib_tcb *tcb; - tcb = THREAD_ARG(goner->timer); - THREAD_OFF(goner->timer); + tcb = EVENT_ARG(goner->timer); + EVENT_OFF(goner->timer); XFREE(MTYPE_RFAPI_RECENT_DELETE, tcb); } XFREE(MTYPE_RFAPI_INFO, goner); @@ -280,7 +280,7 @@ struct rfapi_rib_tcb { */ static void rfapiRibExpireTimer(struct event *t) { - struct rfapi_rib_tcb *tcb = THREAD_ARG(t); + struct rfapi_rib_tcb *tcb = EVENT_ARG(t); RFAPI_RIB_CHECK_COUNTS(1, 0); @@ -325,8 +325,8 @@ static void rfapiRibStartTimer(struct rfapi_descriptor *rfd, struct rfapi_rib_tcb *tcb = NULL; if (ri->timer) { - tcb = THREAD_ARG(ri->timer); - THREAD_OFF(ri->timer); + tcb = EVENT_ARG(ri->timer); + EVENT_OFF(ri->timer); } else { tcb = XCALLOC(MTYPE_RFAPI_RECENT_DELETE, sizeof(struct rfapi_rib_tcb)); @@ -900,8 +900,8 @@ static void process_pending_node(struct bgp *bgp, struct rfapi_descriptor *rfd, if (ri->timer) { struct rfapi_rib_tcb *tcb; - tcb = THREAD_ARG(ri->timer); - THREAD_OFF(ri->timer); + tcb = EVENT_ARG(ri->timer); + EVENT_OFF(ri->timer); XFREE(MTYPE_RFAPI_RECENT_DELETE, tcb); } @@ -985,8 +985,8 @@ static void process_pending_node(struct bgp *bgp, struct rfapi_descriptor *rfd, if (ori->timer) { struct rfapi_rib_tcb *tcb; - tcb = THREAD_ARG(ori->timer); - THREAD_OFF(ori->timer); + tcb = EVENT_ARG(ori->timer); + EVENT_OFF(ori->timer); XFREE(MTYPE_RFAPI_RECENT_DELETE, tcb); } @@ -1319,8 +1319,8 @@ callback: if (ri->timer) { struct rfapi_rib_tcb *tcb; - tcb = THREAD_ARG(ri->timer); - THREAD_OFF(ri->timer); + tcb = EVENT_ARG(ri->timer); + EVENT_OFF(ri->timer); XFREE(MTYPE_RFAPI_RECENT_DELETE, tcb); } RFAPI_RIB_CHECK_COUNTS(0, delete_list->count); |