mirror of
https://git.proxmox.com/git/mirror_frr
synced 2025-08-07 19:10:35 +00:00
lib: fix merge error
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
This commit is contained in:
parent
972a411ccc
commit
26eb0e4ff5
@ -1115,7 +1115,6 @@ thread_cancel (struct thread *thread)
|
|||||||
listnode_add (thread->master->cancel_req, cr);
|
listnode_add (thread->master->cancel_req, cr);
|
||||||
do_thread_cancel (thread->master);
|
do_thread_cancel (thread->master);
|
||||||
}
|
}
|
||||||
done:
|
|
||||||
pthread_mutex_unlock (&thread->master->mtx);
|
pthread_mutex_unlock (&thread->master->mtx);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user