From: anlan_cs Date: Sun, 30 Jan 2022 07:13:39 +0000 (-0500) Subject: pimd: cosmetic change X-Git-Tag: pim6-testing-20220430~300^2 X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=de674e9fc2543b086eece60f37a04dedb9701183;p=matthieu%2Ffrr.git pimd: cosmetic change Remove one empty line. And correct one word. Signed-off-by: anlan_cs --- diff --git a/pimd/pim_ifchannel.c b/pimd/pim_ifchannel.c index a613c89b7e..b3573e29e3 100644 --- a/pimd/pim_ifchannel.c +++ b/pimd/pim_ifchannel.c @@ -269,7 +269,7 @@ void pim_ifchannel_ifjoin_switch(const char *caller, struct pim_ifchannel *ch, if (old_state == new_state) { if (PIM_DEBUG_PIM_EVENTS) { zlog_debug( - "%s calledby %s: non-transition on state %d (%s)", + "%s called by %s: non-transition on state %d (%s)", __func__, caller, new_state, pim_ifchannel_ifjoin_name(new_state, 0)); } diff --git a/pimd/pim_nht.c b/pimd/pim_nht.c index beaa5c802b..2e690d85f6 100644 --- a/pimd/pim_nht.c +++ b/pimd/pim_nht.c @@ -611,9 +611,8 @@ static int pim_ecmp_nexthop_search(struct pim_instance *pim, pim_addr nhaddr = nh_node->gate.ipv6; #endif nbrs[i] = pim_neighbor_find(ifps[i], nhaddr); - if (nbrs[i] || pim_if_connected_to_source(ifps[i], - - src->u.prefix4)) + if (nbrs[i] || + pim_if_connected_to_source(ifps[i], src->u.prefix4)) num_nbrs++; } }