diff options
| author | Mark Stapp <mjs@voltanet.io> | 2019-11-13 16:46:36 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-13 16:46:36 -0500 |
| commit | b6af40b98a5ed65b4b78e6cda650941e5bfdfa7d (patch) | |
| tree | 96240a0e14a4a2f8a6c7e9bfa73a377f24ea460e /zebra/zebra_dplane.c | |
| parent | 4e389d98366fb87f3f75b8983a5e1c3ad3691ddd (diff) | |
| parent | 9344d3fcd3bee7e9ac4ea2acfbf918817678020b (diff) | |
Merge pull request #5321 from sworleys/Zebra-Dplane-Thread-Cancel-Async
zebra: dplane cancel update thread from correct pthread
Diffstat (limited to 'zebra/zebra_dplane.c')
| -rw-r--r-- | zebra/zebra_dplane.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/zebra/zebra_dplane.c b/zebra/zebra_dplane.c index a88b0a38da..7f993442a6 100644 --- a/zebra/zebra_dplane.c +++ b/zebra/zebra_dplane.c @@ -3752,7 +3752,9 @@ void zebra_dplane_shutdown(void) zdplane_info.dg_run = false; - THREAD_OFF(zdplane_info.dg_t_update); + if (zdplane_info.dg_t_update) + thread_cancel_async(zdplane_info.dg_t_update->master, + &zdplane_info.dg_t_update, NULL); frr_pthread_stop(zdplane_info.dg_pthread, NULL); |