From: Igor Ryzhov <iryzhov@nfware.com>
Date: Tue, 13 Oct 2020 20:11:10 +0000 (+0300)
Subject: ospfd: don't remove interface config when removing router
X-Git-Tag: base_7.6~340^2~6
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=9466ef38ccaaf8b0128719a68cd01c95494196cb;p=matthieu%2Ffrr.git

ospfd: don't remove interface config when removing router

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
---

diff --git a/ospfd/ospfd.c b/ospfd/ospfd.c
index aa063a0759..918f0b202b 100644
--- a/ospfd/ospfd.c
+++ b/ospfd/ospfd.c
@@ -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);