summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnuradha Karuppiah <anuradhak@cumulusnetworks.com>2019-11-15 11:44:37 -0800
committerAnuradha Karuppiah <anuradhak@cumulusnetworks.com>2019-11-15 14:16:08 -0800
commit11913c322be9ebb1f2a99806f182125d7036af7f (patch)
treec5c4f12ace2d5acbf5122bbf9d6e1784cb2f4f6f
parent1537a66871ad2f46d0bbed23ef5b87c0b1e102e3 (diff)
pimd: re-eval JD unconditionally when an ifchannel is removed
This is to account for cases like prune-pending which is treated as joined. Signed-off-by: Anuradha Karuppiah <anuradhak@cumulusnetworks.com>
-rw-r--r--pimd/pim_ifchannel.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/pimd/pim_ifchannel.c b/pimd/pim_ifchannel.c
index 182cf33223..d091505837 100644
--- a/pimd/pim_ifchannel.c
+++ b/pimd/pim_ifchannel.c
@@ -181,9 +181,7 @@ void pim_ifchannel_delete(struct pim_ifchannel *ch)
listnode_delete(ch->upstream->ifchannels, ch);
- if (ch->ifjoin_state != PIM_IFJOIN_NOINFO) {
- pim_upstream_update_join_desired(pim_ifp->pim, ch->upstream);
- }
+ pim_upstream_update_join_desired(pim_ifp->pim, ch->upstream);
/* upstream is common across ifchannels, check if upstream's
ifchannel list is empty before deleting upstream_del