zebra: Allow ns delete to happen after under/over flow checks

[mirror_frr.git] / pimd / pim_nht.c

diff --git a/pimd/pim_nht.c b/pimd/pim_nht.c
index 74dfed04553f9d01bd4d833ad9ac7875ae52c676..2d808639b553949b21d10ff80f34fc83b588ead9 100644 (file)
--- a/pimd/pim_nht.c
+++ b/pimd/pim_nht.c
@@ -196,7 +196,7 @@ void pim_delete_tracked_nexthop(struct pim_instance *pim, struct prefix *addr,
                        pim_sendmsg_zebra_rnh(pim, zclient, pnc,
                                              ZEBRA_NEXTHOP_UNREGISTER);
 
-                       list_delete_and_null(&pnc->rp_list);
+                       list_delete(&pnc->rp_list);
                        hash_free(pnc->upstream_hash);
 
                        hash_release(pim->rpf_hash, pnc);
@@ -352,7 +352,7 @@ int pim_ecmp_nexthop_search(struct pim_instance *pim,
                            struct pim_nexthop *nexthop, struct prefix *src,
                            struct prefix *grp, int neighbor_needed)
 {
-       struct pim_neighbor *nbrs[MULTIPATH_NUM], *nbr;
+       struct pim_neighbor *nbrs[MULTIPATH_NUM], *nbr = NULL;
        struct interface *ifps[MULTIPATH_NUM];
        struct nexthop *nh_node = NULL;
        ifindex_t first_ifindex;