]> git.puffer.fish Git - mirror/frr.git/commitdiff
fpm: don't check for NULL on async events
authorRafael Zalamena <rzalamena@opensourcerouting.org>
Wed, 29 Apr 2020 14:16:29 +0000 (11:16 -0300)
committerRafael Zalamena <rzalamena@opensourcerouting.org>
Tue, 5 May 2020 11:48:59 +0000 (08:48 -0300)
`thread_cancel_async` already handles the case of NULL events.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
zebra/dplane_fpm_nl.c

index 32b7faaad744c38cb2963886f3510bcd4e9f2ed5..bf8042efe5afc4a4010701e65d1efc9ef7cba637 100644 (file)
@@ -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)