diff options
| author | Donatas Abraitis <donatas@opensourcerouting.org> | 2022-07-22 08:26:08 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-22 08:26:08 +0300 |
| commit | eed5b70f94b51c05bdbcebf39ade792213fd124b (patch) | |
| tree | 82932e6c0215ec11400b2b9e7efd911d7880d285 /zebra/zebra_fpm.c | |
| parent | cb6c39645fae5211bd15b43a1b7879fb4c4b308c (diff) | |
| parent | 2783a6921c8fd3917caa539df82e0d9f2a23eb0c (diff) | |
Merge pull request #11657 from donaldsharp/why_timer
convert thread_cancel to THREAD_OFF
Diffstat (limited to 'zebra/zebra_fpm.c')
| -rw-r--r-- | zebra/zebra_fpm.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/zebra/zebra_fpm.c b/zebra/zebra_fpm.c index 39b7156ce4..21acaa823c 100644 --- a/zebra/zebra_fpm.c +++ b/zebra/zebra_fpm.c @@ -496,7 +496,7 @@ static inline void zfpm_write_on(void) */ static inline void zfpm_read_off(void) { - thread_cancel(&zfpm_g->t_read); + THREAD_OFF(zfpm_g->t_read); } /* @@ -504,12 +504,12 @@ static inline void zfpm_read_off(void) */ static inline void zfpm_write_off(void) { - thread_cancel(&zfpm_g->t_write); + THREAD_OFF(zfpm_g->t_write); } static inline void zfpm_connect_off(void) { - thread_cancel(&zfpm_g->t_connect); + THREAD_OFF(zfpm_g->t_connect); } /* @@ -583,7 +583,7 @@ static void zfpm_connection_up(const char *detail) /* * Start thread to push existing routes to the FPM. */ - thread_cancel(&zfpm_g->t_conn_up); + THREAD_OFF(zfpm_g->t_conn_up); zfpm_rnodes_iter_init(&zfpm_g->t_conn_up_state.iter); zfpm_g->fpm_mac_dump_done = false; @@ -1687,7 +1687,7 @@ static void zfpm_stop_stats_timer(void) return; zfpm_debug("Stopping existing stats timer"); - thread_cancel(&zfpm_g->t_stats); + THREAD_OFF(zfpm_g->t_stats); } /* |