summaryrefslogtreecommitdiffstats
path: root/pimd/pim_bsm.c
diff options
context:
space:
mode:
authorDonald Sharp <sharpd@nvidia.com>2022-02-23 01:04:25 +0100
committerDonald Sharp <sharpd@nvidia.com>2022-02-24 01:56:04 +0100
commitcc9f21da2218d95567eff1501482ce58e6600f54 (patch)
treed579c9754161d874bad6eb09c67821b65fb559ca /pimd/pim_bsm.c
parentMerge pull request #10621 from donaldsharp/cov_fun (diff)
downloadfrr-cc9f21da2218d95567eff1501482ce58e6600f54.tar.xz
frr-cc9f21da2218d95567eff1501482ce58e6600f54.zip
*: Change thread->func to return void instead of int
The int return value is never used. Modify the code base to just return a void instead. Signed-off-by: Donald Sharp <sharpd@nvidia.com>
Diffstat (limited to 'pimd/pim_bsm.c')
-rw-r--r--pimd/pim_bsm.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/pimd/pim_bsm.c b/pimd/pim_bsm.c
index 0b993ec05..5901ae343 100644
--- a/pimd/pim_bsm.c
+++ b/pimd/pim_bsm.c
@@ -157,7 +157,7 @@ static struct bsgrp_node *pim_bsm_new_bsgrp_node(struct route_table *rt,
return bsgrp;
}
-static int pim_on_bs_timer(struct thread *t)
+static void pim_on_bs_timer(struct thread *t)
{
struct route_node *rn;
struct bsm_scope *scope;
@@ -200,7 +200,6 @@ static int pim_on_bs_timer(struct thread *t)
pim_bsm_rpinfos_free(bsgrp_node->partial_bsrp_list);
bsgrp_node->pend_rp_cnt = 0;
}
- return 0;
}
static void pim_bs_timer_stop(struct bsm_scope *scope)
@@ -276,7 +275,7 @@ static bool is_hold_time_elapsed(void *data)
return true;
}
-static int pim_on_g2rp_timer(struct thread *t)
+static void pim_on_g2rp_timer(struct thread *t)
{
struct bsm_rpinfo *bsrp;
struct bsm_rpinfo *bsrp_node;
@@ -312,14 +311,14 @@ static int pim_on_g2rp_timer(struct thread *t)
if (!rn) {
zlog_warn("%s: Route node doesn't exist", __func__);
- return 0;
+ return;
}
rp_info = (struct rp_info *)rn->info;
if (!rp_info) {
route_unlock_node(rn);
- return 0;
+ return;
}
if (rp_info->rp_src != RP_SRC_STATIC) {
@@ -342,8 +341,6 @@ static int pim_on_g2rp_timer(struct thread *t)
&bsgrp_node->group);
pim_free_bsgrp_data(bsgrp_node);
}
-
- return 0;
}
static void pim_g2rp_timer_start(struct bsm_rpinfo *bsrp, int hold_time)