diff options
| author | Mitesh Kanjariya <mitesh@cumulusnetworks.com> | 2018-02-27 01:46:26 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-27 01:46:26 -0800 |
| commit | 23e386ac714b48872d7d41ad118b12ebbc22984c (patch) | |
| tree | 295c1033f46f99eaacf014dde0b42beb035f1e71 /pimd/pim_iface.c | |
| parent | 6fb219da876ace4732e31005466cae708e512d42 (diff) | |
| parent | ac3133a35d340a765be1518c2669b979e39fbe66 (diff) | |
Merge branch 'master' into type5-default-originate
Diffstat (limited to 'pimd/pim_iface.c')
| -rw-r--r-- | pimd/pim_iface.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/pimd/pim_iface.c b/pimd/pim_iface.c index f02cf7ed31..a807c69c60 100644 --- a/pimd/pim_iface.c +++ b/pimd/pim_iface.c @@ -85,9 +85,11 @@ static void *if_list_clean(struct pim_interface *pim_ifp) if (pim_ifp->sec_addr_list) list_delete_and_null(&pim_ifp->sec_addr_list); - while ((ch = RB_ROOT(pim_ifchannel_rb, - &pim_ifp->ifchannel_rb)) != NULL) + while (!RB_EMPTY(pim_ifchannel_rb, &pim_ifp->ifchannel_rb)) { + ch = RB_ROOT(pim_ifchannel_rb, &pim_ifp->ifchannel_rb); + pim_ifchannel_delete(ch); + } XFREE(MTYPE_PIM_INTERFACE, pim_ifp); @@ -250,9 +252,11 @@ void pim_if_delete(struct interface *ifp) if (pim_ifp->boundary_oil_plist) XFREE(MTYPE_PIM_INTERFACE, pim_ifp->boundary_oil_plist); - while ((ch = RB_ROOT(pim_ifchannel_rb, - &pim_ifp->ifchannel_rb)) != NULL) + while (!RB_EMPTY(pim_ifchannel_rb, &pim_ifp->ifchannel_rb)) { + ch = RB_ROOT(pim_ifchannel_rb, &pim_ifp->ifchannel_rb); + pim_ifchannel_delete(ch); + } XFREE(MTYPE_PIM_INTERFACE, pim_ifp); |