Merge pull request #9906 from patrasar/2553196

pimd: During Joined -> NotJoined, upstream should send prune nomatter
This commit is contained in:
Donald Sharp 2021-11-24 12:33:44 -05:00 committed by GitHub
commit e5b5ea92c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -803,9 +803,8 @@ void pim_upstream_switch(struct pim_instance *pim, struct pim_upstream *up,
if (pim_upstream_is_sg_rpt(up) && up->parent &&
!I_am_RP(pim, up->sg.grp))
send_xg_jp = true;
else
pim_jp_agg_single_upstream_send(&up->rpf, up,
0 /* prune */);
pim_jp_agg_single_upstream_send(&up->rpf, up, 0 /* prune */);
if (send_xg_jp) {
if (PIM_DEBUG_PIM_TRACE_DETAIL)