diff options
| author | Quentin Young <qlyoung@cumulusnetworks.com> | 2017-06-29 19:49:45 +0200 |
|---|---|---|
| committer | Quentin Young <qlyoung@cumulusnetworks.com> | 2017-06-30 01:40:57 +0200 |
| commit | 26eb0e4ff5031e791b4fd23d397dc15e1beab8d1 (patch) | |
| tree | d10a4bbeed5ad0d18e0f537355106d6f8f88d81b /lib/thread.c | |
| parent | lib: more `show thread cpu` (diff) | |
| download | frr-26eb0e4ff5031e791b4fd23d397dc15e1beab8d1.tar.xz frr-26eb0e4ff5031e791b4fd23d397dc15e1beab8d1.zip | |
lib: fix merge error
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
Diffstat (limited to '')
| -rw-r--r-- | lib/thread.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/thread.c b/lib/thread.c index 5a7888379..bc52d1b13 100644 --- a/lib/thread.c +++ b/lib/thread.c @@ -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); } |