pimd: Clean up rpf_hash *after* upstream cleanup

Cleanup the pim->rpf_hash after upstream cleanup is done
since upstream cleanup uses the rpf_hash to cleanup itself.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

diff --git a/pimd/pim_instance.c b/pimd/pim_instance.c
index ab4ffc26ae4906816e2eecfdc6f54c85d9ea1df8..7e5bb34e31ee391f97cec7139f8a6c93e09eb509 100644 (file)
--- a/pimd/pim_instance.c
+++ b/pimd/pim_instance.c
@@ -35,13 +35,6 @@
 
 static void pim_instance_terminate(struct pim_instance *pim)
 {
-       /* Traverse and cleanup rpf_hash */
-       if (pim->rpf_hash) {
-               hash_clean(pim->rpf_hash, (void *)pim_rp_list_hash_clean);
-               hash_free(pim->rpf_hash);
-               pim->rpf_hash = NULL;
-       }
-
        if (pim->ssm_info) {
                pim_ssm_terminate(pim->ssm_info);
                pim->ssm_info = NULL;
@@ -54,6 +47,13 @@ static void pim_instance_terminate(struct pim_instance *pim)
 
        pim_upstream_terminate(pim);
 
+       /* Traverse and cleanup rpf_hash */
+       if (pim->rpf_hash) {
+               hash_clean(pim->rpf_hash, (void *)pim_rp_list_hash_clean);
+               hash_free(pim->rpf_hash);
+               pim->rpf_hash = NULL;
+       }
+
        pim_oil_terminate(pim);
 
        pim_if_terminate(pim);