summaryrefslogtreecommitdiff
path: root/pimd/pim_igmp.c
diff options
context:
space:
mode:
Diffstat (limited to 'pimd/pim_igmp.c')
-rw-r--r--pimd/pim_igmp.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/pimd/pim_igmp.c b/pimd/pim_igmp.c
index b9be8fc040..c883a2c8bb 100644
--- a/pimd/pim_igmp.c
+++ b/pimd/pim_igmp.c
@@ -156,7 +156,6 @@ static int pim_igmp_other_querier_expire(struct thread *t)
igmp = THREAD_ARG(t);
- zassert(igmp->t_other_querier_timer);
zassert(!igmp->t_igmp_query_timer);
if (PIM_DEBUG_IGMP_TRACE) {
@@ -167,8 +166,6 @@ static int pim_igmp_other_querier_expire(struct thread *t)
ifaddr_str);
}
- igmp->t_other_querier_timer = NULL;
-
/*
We are the current querier, then
re-start sending general queries.
@@ -204,9 +201,7 @@ void pim_igmp_other_querier_timer_on(struct igmp_sock *igmp)
zlog_debug("Querier %s resetting TIMER event for Other-Querier-Present",
ifaddr_str);
}
-
THREAD_OFF(igmp->t_other_querier_timer);
- zassert(!igmp->t_other_querier_timer);
}
else {
/*
@@ -268,7 +263,6 @@ void pim_igmp_other_querier_timer_off(struct igmp_sock *igmp)
}
}
THREAD_OFF(igmp->t_other_querier_timer);
- zassert(!igmp->t_other_querier_timer);
}
static int
@@ -966,7 +960,6 @@ static int igmp_group_timer(struct thread *t)
zassert(group->group_filtermode_isexcl);
- group->t_group_timer = NULL;
group->group_filtermode_isexcl = 0;
/* Any source (*,G) is forwarded only if mode is EXCLUDE {empty} */
@@ -974,7 +967,6 @@ static int igmp_group_timer(struct thread *t)
igmp_source_delete_expired(group->group_source_list);
- zassert(!group->t_group_timer);
zassert(!group->group_filtermode_isexcl);
/*
@@ -1001,9 +993,7 @@ static void group_timer_off(struct igmp_group *group)
zlog_debug("Cancelling TIMER event for group %s on %s",
group_str, group->group_igmp_sock->interface->name);
}
-
THREAD_OFF(group->t_group_timer);
- zassert(!group->t_group_timer);
}
void igmp_group_timer_on(struct igmp_group *group,