Merge pull request #5321 from sworleys/Zebra-Dplane-Thread-Cancel-Async

zebra: dplane cancel update thread from correct pthread
FRRouting · Nov 13, 2019 · b6af40b · b6af40b
2 parents 4e389d9 + 9344d3f
commit b6af40b
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/zebra/zebra_dplane.c b/zebra/zebra_dplane.c
@@ -3752,7 +3752,9 @@ void zebra_dplane_shutdown(void)
 
 	zdplane_info.dg_run = false;
 
-	THREAD_OFF(zdplane_info.dg_t_update);
+	if (zdplane_info.dg_t_update)
+		thread_cancel_async(zdplane_info.dg_t_update->master,
+				    &zdplane_info.dg_t_update, NULL);
 
 	frr_pthread_stop(zdplane_info.dg_pthread, NULL);