summaryrefslogtreecommitdiffstats
path: root/pimd/pim_neighbor.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_neighbor.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_neighbor.c')
-rw-r--r--pimd/pim_neighbor.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/pimd/pim_neighbor.c b/pimd/pim_neighbor.c
index 6e3d2739e..84b532d34 100644
--- a/pimd/pim_neighbor.c
+++ b/pimd/pim_neighbor.c
@@ -200,7 +200,7 @@ static void update_dr_priority(struct pim_neighbor *neigh,
}
}
-static int on_neighbor_timer(struct thread *t)
+static void on_neighbor_timer(struct thread *t)
{
struct pim_neighbor *neigh;
struct interface *ifp;
@@ -226,8 +226,6 @@ static int on_neighbor_timer(struct thread *t)
router's own DR Priority changes.
*/
pim_if_dr_election(ifp); // neighbor times out
-
- return 0;
}
void pim_neighbor_timer_reset(struct pim_neighbor *neigh, uint16_t holdtime)
@@ -252,7 +250,7 @@ void pim_neighbor_timer_reset(struct pim_neighbor *neigh, uint16_t holdtime)
neigh->holdtime, &neigh->t_expire_timer);
}
-static int on_neighbor_jp_timer(struct thread *t)
+static void on_neighbor_jp_timer(struct thread *t)
{
struct pim_neighbor *neigh = THREAD_ARG(t);
struct pim_rpf rpf;
@@ -269,8 +267,6 @@ static int on_neighbor_jp_timer(struct thread *t)
thread_add_timer(router->master, on_neighbor_jp_timer, neigh,
router->t_periodic, &neigh->jp_timer);
-
- return 0;
}
static void pim_neighbor_start_jp_timer(struct pim_neighbor *neigh)