From: Rafael Zalamena Date: Wed, 29 Apr 2020 14:16:29 +0000 (-0300) Subject: fpm: don't check for NULL on async events X-Git-Tag: base_7.5~368^2~5 X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=c69e7ab7d96d605c9d0713f4fd9dbdd206030695;p=matthieu%2Ffrr.git fpm: don't check for NULL on async events `thread_cancel_async` already handles the case of NULL events. Signed-off-by: Rafael Zalamena --- diff --git a/zebra/dplane_fpm_nl.c b/zebra/dplane_fpm_nl.c index 32b7faaad7..bf8042efe5 100644 --- a/zebra/dplane_fpm_nl.c +++ b/zebra/dplane_fpm_nl.c @@ -399,14 +399,10 @@ static void fpm_reconnect(struct fpm_nl_ctx *fnc) THREAD_OFF(fnc->t_read); THREAD_OFF(fnc->t_write); - if (fnc->t_ribreset) - thread_cancel_async(zrouter.master, &fnc->t_ribreset, NULL); - if (fnc->t_ribwalk) - thread_cancel_async(zrouter.master, &fnc->t_ribwalk, NULL); - if (fnc->t_rmacreset) - thread_cancel_async(zrouter.master, &fnc->t_rmacreset, NULL); - if (fnc->t_rmacwalk) - thread_cancel_async(zrouter.master, &fnc->t_rmacwalk, NULL); + thread_cancel_async(zrouter.master, &fnc->t_ribreset, NULL); + thread_cancel_async(zrouter.master, &fnc->t_ribwalk, NULL); + thread_cancel_async(zrouter.master, &fnc->t_rmacreset, NULL); + thread_cancel_async(zrouter.master, &fnc->t_rmacwalk, NULL); /* FPM is disabled, don't attempt to connect. */ if (fnc->disabled)