diff options
| author | Donatas Abraitis <donatas@opensourcerouting.org> | 2022-11-15 11:28:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-15 11:28:25 +0200 |
| commit | 47c5955841fef46d921ff10b2d70691c2f439851 (patch) | |
| tree | 15ecbec0f5d1aca829e8121dad6ce1bb9f8e8af7 | |
| parent | 72e7872400817cb19b5b825cde70df50c6d2c86a (diff) | |
| parent | f97e6d92b33df5c1648382c73f2c6d64a1a0c275 (diff) | |
Merge pull request #12319 from FRRouting/mergify/bp/stable/8.4/pr-12315
Dplane sorry (backport #12315)
| -rw-r--r-- | zebra/dplane_fpm_nl.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/zebra/dplane_fpm_nl.c b/zebra/dplane_fpm_nl.c index d07c4c6332..c5e1c113cb 100644 --- a/zebra/dplane_fpm_nl.c +++ b/zebra/dplane_fpm_nl.c @@ -98,6 +98,7 @@ struct fpm_nl_ctx { struct thread *t_read; struct thread *t_write; struct thread *t_event; + struct thread *t_nhg; struct thread *t_dequeue; /* zebra events. */ @@ -271,7 +272,7 @@ DEFUN(fpm_use_nhg, fpm_use_nhg_cmd, return CMD_SUCCESS; thread_add_event(gfnc->fthread->master, fpm_process_event, gfnc, - FNE_TOGGLE_NHG, &gfnc->t_event); + FNE_TOGGLE_NHG, &gfnc->t_nhg); return CMD_SUCCESS; } @@ -287,7 +288,7 @@ DEFUN(no_fpm_use_nhg, no_fpm_use_nhg_cmd, return CMD_SUCCESS; thread_add_event(gfnc->fthread->master, fpm_process_event, gfnc, - FNE_TOGGLE_NHG, &gfnc->t_event); + FNE_TOGGLE_NHG, &gfnc->t_nhg); return CMD_SUCCESS; } @@ -1275,7 +1276,7 @@ static void fpm_process_queue(struct thread *t) static void fpm_process_event(struct thread *t) { struct fpm_nl_ctx *fnc = THREAD_ARG(t); - int event = THREAD_VAL(t); + enum fpm_nl_events event = THREAD_VAL(t); switch (event) { case FNE_DISABLE: @@ -1328,11 +1329,6 @@ static void fpm_process_event(struct thread *t) if (IS_ZEBRA_DEBUG_FPM) zlog_debug("%s: LSP walk finished", __func__); break; - - default: - if (IS_ZEBRA_DEBUG_FPM) - zlog_debug("%s: unhandled event %d", __func__, event); - break; } } @@ -1372,6 +1368,8 @@ static int fpm_nl_finish_early(struct fpm_nl_ctx *fnc) THREAD_OFF(fnc->t_ribwalk); THREAD_OFF(fnc->t_rmacreset); THREAD_OFF(fnc->t_rmacwalk); + THREAD_OFF(fnc->t_event); + THREAD_OFF(fnc->t_nhg); thread_cancel_async(fnc->fthread->master, &fnc->t_read, NULL); thread_cancel_async(fnc->fthread->master, &fnc->t_write, NULL); thread_cancel_async(fnc->fthread->master, &fnc->t_connect, NULL); |