summaryrefslogtreecommitdiffstats
path: root/pimd/pim_igmp.c
diff options
context:
space:
mode:
authorDonatas Abraitis <donatas.abraitis@gmail.com>2021-10-04 18:26:20 +0200
committerDonatas Abraitis <donatas.abraitis@gmail.com>2021-10-04 18:29:06 +0200
commitbf5335cf3421811cd419d9b40be69d2ad9ed8bde (patch)
tree9000ffd71f8aff4c8c8afff8ddb9495525bde876 /pimd/pim_igmp.c
parentospf6d: Do not explicitly set the thread pointer to NULL (diff)
downloadfrr-bf5335cf3421811cd419d9b40be69d2ad9ed8bde.tar.xz
frr-bf5335cf3421811cd419d9b40be69d2ad9ed8bde.zip
pimd: Do not explicitly set the thread pointer to NULL
FRR should only ever use the appropriate THREAD_ON/THREAD_OFF semantics. This is espacially true for the functions we end up calling the thread for. Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
Diffstat (limited to 'pimd/pim_igmp.c')
-rw-r--r--pimd/pim_igmp.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/pimd/pim_igmp.c b/pimd/pim_igmp.c
index 50de7124d..795c96c83 100644
--- a/pimd/pim_igmp.c
+++ b/pimd/pim_igmp.c
@@ -671,7 +671,6 @@ void pim_igmp_general_query_on(struct igmp_sock *igmp)
ifaddr_str, query_interval,
startup_mode ? "startup" : "non-startup", igmp->fd);
}
- igmp->t_igmp_query_timer = NULL;
thread_add_timer(router->master, pim_igmp_general_query, igmp,
query_interval, &igmp->t_igmp_query_timer);
}
@@ -1052,7 +1051,6 @@ static void igmp_read_on(struct igmp_sock *igmp)
zlog_debug("Scheduling READ event on IGMP socket fd=%d",
igmp->fd);
}
- igmp->t_igmp_read = NULL;
thread_add_read(router->master, pim_igmp_read, igmp, igmp->fd,
&igmp->t_igmp_read);
}