diff options
| -rw-r--r-- | pimd/pim_ifchannel.c | 2 | ||||
| -rw-r--r-- | pimd/pim_nht.c | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/pimd/pim_ifchannel.c b/pimd/pim_ifchannel.c index a613c89b7..b3573e29e 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 beaa5c802..2e690d85f 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++; } } |