]> git.puffer.fish Git - matthieu/frr.git/commitdiff
ospfd: don't remove interface config when removing router
authorIgor Ryzhov <iryzhov@nfware.com>
Tue, 13 Oct 2020 20:11:10 +0000 (23:11 +0300)
committerIgor Ryzhov <iryzhov@nfware.com>
Tue, 13 Oct 2020 20:11:10 +0000 (23:11 +0300)
Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
ospfd/ospfd.c

index aa063a0759af436ef6c3116c2dfd5e4d8e20cb4f..918f0b202b2e792f0dcd6d3bf178f6ad699ba864 100644 (file)
@@ -585,7 +585,6 @@ static void ospf_finish_final(struct ospf *ospf)
        struct route_node *rn;
        struct ospf_nbr_nbma *nbr_nbma;
        struct ospf_lsa *lsa;
-       struct interface *ifp;
        struct ospf_interface *oi;
        struct ospf_area *area;
        struct ospf_vl_data *vl_data;
@@ -628,15 +627,6 @@ static void ospf_finish_final(struct ospf *ospf)
        if (ospf->vrf_id == VRF_DEFAULT)
                ospf_ldp_sync_gbl_exit(ospf, true);
 
-       /* Remove any ospf interface config params */
-       FOR_ALL_INTERFACES (vrf, ifp) {
-               struct ospf_if_params *params;
-
-               params = IF_DEF_PARAMS(ifp);
-               if (OSPF_IF_PARAM_CONFIGURED(params, if_area))
-                       UNSET_IF_PARAM(params, if_area);
-       }
-
        /* Reset interface. */
        for (ALL_LIST_ELEMENTS(ospf->oiflist, node, nnode, oi))
                ospf_if_free(oi);