Merge pull request #3108 from dmbaturin/master

[mirror_frr.git] / pimd / pim_msdp.c

diff --git a/pimd/pim_msdp.c b/pimd/pim_msdp.c
index 7fcf42e8ce3adadcd013bcd198ffbe574f558af9..9ef343a0c5d77cce189b725957bee29bace47d49 100644 (file)
--- a/pimd/pim_msdp.c
+++ b/pimd/pim_msdp.c
@@ -519,7 +519,7 @@ static void pim_msdp_sa_local_del_on_up_del(struct pim_instance *pim,
                         * changes; perhaps
                         * address this in the next release? - XXX  */
                        flog_err(
-                                 LIB_ERR_DEVELOPMENT,
+                               EC_LIB_DEVELOPMENT,
                                "MSDP sa %s SPT teardown is causing the local entry to be removed",
                                sa->sg_str);
                        return;
@@ -1260,7 +1260,7 @@ static void pim_msdp_mg_free(struct pim_instance *pim)
                XFREE(MTYPE_PIM_MSDP_MG_NAME, mg->mesh_group_name);
 
        if (mg->mbr_list)
-               list_delete_and_null(&mg->mbr_list);
+               list_delete(&mg->mbr_list);
 
        XFREE(MTYPE_PIM_MSDP_MG, pim->msdp.mg);
 }
@@ -1610,7 +1610,7 @@ void pim_msdp_exit(struct pim_instance *pim)
        }
 
        if (pim->msdp.peer_list) {
-               list_delete_and_null(&pim->msdp.peer_list);
+               list_delete(&pim->msdp.peer_list);
        }
 
        if (pim->msdp.sa_hash) {
@@ -1620,7 +1620,7 @@ void pim_msdp_exit(struct pim_instance *pim)
        }
 
        if (pim->msdp.sa_list) {
-               list_delete_and_null(&pim->msdp.sa_list);
+               list_delete(&pim->msdp.sa_list);
        }
 
        if (pim->msdp.work_obuf)