Merge pull request #7868 from mjstapp/fix_fpm_conn_up

zebra: don't set connection-up event pointer directly

diff --cc zebra/zebra_fpm.c
index 8f5e7e857443506b82e672d6009afda3e804a725,d83f45e6b4952805e3eef6fde1945e2019a588a4..18ccbb79fba37ab3107e1b36cc2ac610cb60ae85
--- 1/zebra/zebra_fpm.c
--- 2/zebra/zebra_fpm.c
+++ b/zebra/zebra_fpm.c
@@@ -585,13 -572,12 +582,13 @@@ static void zfpm_connection_up(const ch
        /*
         * Start thread to push existing routes to the FPM.
         */
-       assert(!zfpm_g->t_conn_up);
+       thread_cancel(&zfpm_g->t_conn_up);
  
        zfpm_rnodes_iter_init(&zfpm_g->t_conn_up_state.iter);
 +      zfpm_g->fpm_mac_dump_done = false;
  
        zfpm_debug("Starting conn_up thread");
-       zfpm_g->t_conn_up = NULL;
+ 
        thread_add_timer_msec(zfpm_g->master, zfpm_conn_up_thread_cb, NULL, 0,
                              &zfpm_g->t_conn_up);
        zfpm_g->stats.t_conn_up_starts++;