]> 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>
Wed, 28 Oct 2020 18:35:49 +0000 (21:35 +0300)
Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
ospfd/ospfd.c

index 31d8417eb65ca8ee6d182be35deaa84ca0376ca2..97edc2f3206c3f0e06782a2d26957bcb18fe2865 100644 (file)
@@ -580,7 +580,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;
@@ -619,15 +618,6 @@ static void ospf_finish_final(struct ospf *ospf)
 
        list_delete(&ospf->vlinks);
 
-       /* 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);