Merge pull request #12909 from FRRouting/mergify/bp/dev/8.5/pr-12906

pimd, pim6d: Upstream IIF pointing towards PIM and IGMP disabled source conn… (backport #12906)
This commit is contained in:
Donatas Abraitis 2023-02-27 23:30:42 +02:00 committed by GitHub
commit dbf2b160e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -170,10 +170,10 @@ static int pim_cmd_interface_delete(struct interface *ifp)
* pim_ifp->pim_neighbor_list.
*/
pim_sock_delete(ifp, "pim unconfigured on interface");
pim_upstream_nh_if_update(pim_ifp->pim, ifp);
if (!pim_ifp->gm_enable) {
pim_if_addr_del_all(ifp);
pim_upstream_nh_if_update(pim_ifp->pim, ifp);
pim_if_delete(ifp);
}