Merge pull request #3108 from dmbaturin/master

[mirror_frr.git] / pimd / pim_instance.c

diff --git a/pimd/pim_instance.c b/pimd/pim_instance.c
index bf8d05d1e117671e1cb946a9bcd53bf193089d40..2550651464321d2cf75fbb73d276d5f841e0ab02 100644 (file)
--- a/pimd/pim_instance.c
+++ b/pimd/pim_instance.c
@@ -42,12 +42,12 @@ static void pim_instance_terminate(struct pim_instance *pim)
        }
 
        if (pim->static_routes)
-               list_delete_and_null(&pim->static_routes);
-
-       pim_rp_free(pim);
+               list_delete(&pim->static_routes);
 
        pim_upstream_terminate(pim);
 
+       pim_rp_free(pim);
+
        /* Traverse and cleanup rpf_hash */
        if (pim->rpf_hash) {
                hash_clean(pim->rpf_hash, (void *)pim_rp_list_hash_clean);