proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-16 02:30:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pimd, pim6d: Move api pim_if_membership_clear

Browse Source 
Move pim_if_membership_clear api from pimd/pim_nb_config.c
to pimd/pim_iface.c
Also fixed curly braces warning
WARNING: braces {} are not necessary for single statement blocks
1773: FILE: /tmp/f1-127504/pim_iface.c:1773:

Signed-off-by: Mobashshera Rasool <mrasool@vmware.com>
This commit is contained in:
Mobashshera Rasool 2023-01-03 05:37:34 -08:00
parent 7f0c12d5b3
commit e7356fdba1
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pimd/pim_iface.c
View File

@ -1762,3 +1762,16 @@ void pim_iface_init(void)
if_zapi_callbacks(pim_ifp_create, pim_ifp_up, pim_ifp_down, if_zapi_callbacks(pim_ifp_create, pim_ifp_up, pim_ifp_down,
pim_ifp_destroy); pim_ifp_destroy);
} }
static void pim_if_membership_clear(struct interface *ifp)
{
struct pim_interface *pim_ifp;
pim_ifp = ifp->info;
assert(pim_ifp);
if (pim_ifp->pim_enable && pim_ifp->gm_enable)
return;
pim_ifchannel_membership_clear(ifp);
}

14
pimd/pim_nb_config.c
View File

@ -45,20 +45,6 @@ MACRO_REQUIRE_SEMICOLON()
#define yang_dnode_get_pimaddr yang_dnode_get_ipv4 #define yang_dnode_get_pimaddr yang_dnode_get_ipv4
#endif /* PIM_IPV != 6 */ #endif /* PIM_IPV != 6 */
static void pim_if_membership_clear(struct interface *ifp)
{
struct pim_interface *pim_ifp;
pim_ifp = ifp->info;
assert(pim_ifp);
if (pim_ifp->pim_enable && pim_ifp->gm_enable) {
return;
}
pim_ifchannel_membership_clear(ifp);
}
/* /*
* When PIM is disabled on interface, IGMPv3 local membership * When PIM is disabled on interface, IGMPv3 local membership
* information is not injected into PIM interface state. * information is not injected into PIM interface state.