Merge pull request #5332 from mjstapp/remove_zapi_label_flag

[mirror_frr.git] / ospfd / ospf_opaque.c

diff --git a/ospfd/ospf_opaque.c b/ospfd/ospf_opaque.c
index 7f96299768ed50ada4caf4b4b556bf61523605df..a989b8468cc6b90862ae5d07774249e983e70a5b 100644 (file)
--- a/ospfd/ospf_opaque.c
+++ b/ospfd/ospf_opaque.c
@@ -430,9 +430,9 @@ void ospf_delete_opaque_functab(uint8_t lsa_type, uint8_t opaque_type)
                                /* Cleanup internal control information, if it
                                 * still remains. */
                                if (functab->oipt != NULL) {
+                                       free_opaque_info_owner(functab->oipt);
                                        free_opaque_info_per_type(
                                                functab->oipt);
-                                       free_opaque_info_owner(functab->oipt);
                                }
 
                                /* Dequeue listnode entry from the list. */
@@ -500,7 +500,7 @@ struct opaque_info_per_type {
        /* Collection of callback functions for this opaque-type. */
        struct ospf_opaque_functab *functab;
 
-       /* List of Opaque-LSA control informations per opaque-id. */
+       /* List of Opaque-LSA control information per opaque-id. */
        struct list *id_list;
 };
 
@@ -554,8 +554,8 @@ register_opaque_info_per_type(struct ospf_opaque_functab *functab,
        case OSPF_OPAQUE_AS_LSA:
                top = ospf_lookup_by_vrf_id(new->vrf_id);
                if (new->area != NULL && (top = new->area->ospf) == NULL) {
-                       free_opaque_info_per_type((void *)oipt);
                        free_opaque_info_owner(oipt);
+                       free_opaque_info_per_type(oipt);
                        oipt = NULL;
                        goto out; /* This case may not exist. */
                }
@@ -567,8 +567,8 @@ register_opaque_info_per_type(struct ospf_opaque_functab *functab,
                        EC_OSPF_LSA_UNEXPECTED,
                        "register_opaque_info_per_type: Unexpected LSA-type(%u)",
                        new->data->type);
-               free_opaque_info_per_type((void *)oipt);
                free_opaque_info_owner(oipt);
+               free_opaque_info_per_type(oipt);
                oipt = NULL;
                goto out; /* This case may not exist. */
        }