From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Fri, 15 Jan 2021 11:55:29 +0000 (-0500)
Subject: Merge pull request #7868 from mjstapp/fix_fpm_conn_up
X-Git-Tag: base_7.6~36
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=f7f52f0d2b2c7f3e8187fb9d02a077660f1f60e2;p=matthieu%2Ffrr.git

Merge pull request #7868 from mjstapp/fix_fpm_conn_up

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

f7f52f0d2b2c7f3e8187fb9d02a077660f1f60e2
diff --cc zebra/zebra_fpm.c
index 8f5e7e8574,d83f45e6b4..18ccbb79fb
--- a/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++;