summaryrefslogtreecommitdiff
path: root/zebra/kernel_netlink.c
diff options
context:
space:
mode:
authorQuentin Young <qlyoung@users.noreply.github.com>2020-10-23 15:02:50 -0400
committerGitHub <noreply@github.com>2020-10-23 15:02:50 -0400
commit939bd6ac52aec8def971d19529d0e782aa794ff1 (patch)
tree9104cb9bbb58261935187e42f5fea8b3702e0f1f /zebra/kernel_netlink.c
parent1e4fa7f46cc1c2d1fcb5c427c2d284bd1110a406 (diff)
parent70c583eb819d93d8ec494880f4645be0f942c7a5 (diff)
Merge pull request #6788 from mjstapp/thread_cancel_off
*: unify thread/task cancel apis
Diffstat (limited to 'zebra/kernel_netlink.c')
-rw-r--r--zebra/kernel_netlink.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/zebra/kernel_netlink.c b/zebra/kernel_netlink.c
index c53d28a18c..601e3dfa84 100644
--- a/zebra/kernel_netlink.c
+++ b/zebra/kernel_netlink.c
@@ -1501,7 +1501,7 @@ void kernel_init(struct zebra_ns *zns)
void kernel_terminate(struct zebra_ns *zns, bool complete)
{
- THREAD_READ_OFF(zns->t_netlink);
+ thread_cancel(&zns->t_netlink);
if (zns->netlink.sock >= 0) {
close(zns->netlink.sock);