]> git.puffer.fish Git - mirror/frr.git/commitdiff
lib: fix merge error 723/head
authorQuentin Young <qlyoung@cumulusnetworks.com>
Thu, 29 Jun 2017 17:49:45 +0000 (17:49 +0000)
committerQuentin Young <qlyoung@cumulusnetworks.com>
Thu, 29 Jun 2017 23:40:57 +0000 (23:40 +0000)
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
lib/thread.c

index 5a7888379bffb42e897e40626e47958331675db1..bc52d1b134efedf922d2a6d3b14106133ecd0b5d 100644 (file)
@@ -1115,7 +1115,6 @@ thread_cancel (struct thread *thread)
     listnode_add (thread->master->cancel_req, cr);
     do_thread_cancel (thread->master);
   }
-done:
   pthread_mutex_unlock (&thread->master->mtx);
 }