diff options
author | Russ White <russ@riw.us> | 2018-11-01 02:41:28 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-11-01 02:41:28 +0100 |
commit | 55123eb040781bda93b4055d09d7c303af2e38ac (patch) | |
tree | 84b6a953cac365dfd5cda4b510afa09baa7a1417 /ospfd/ospfd.c | |
parent | Merge pull request #3139 from adharkar/frr-bgp_cli (diff) | |
parent | ospfd: do not remove area structure, while vls are configured (diff) | |
download | frr-55123eb040781bda93b4055d09d7c303af2e38ac.tar.xz frr-55123eb040781bda93b4055d09d7c303af2e38ac.zip |
Merge pull request #3239 from pguibert6WIND/ospf_virtual_link_config
ospfd: do not remove area structure, while vls are configured
Diffstat (limited to 'ospfd/ospfd.c')
-rw-r--r-- | ospfd/ospfd.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ospfd/ospfd.c b/ospfd/ospfd.c index aa40dd0eb..d5d1a7a60 100644 --- a/ospfd/ospfd.c +++ b/ospfd/ospfd.c @@ -890,6 +890,7 @@ void ospf_area_check_free(struct ospf *ospf, struct in_addr area_id) area = ospf_area_lookup_by_area_id(ospf, area_id); if (area && listcount(area->oiflist) == 0 && area->ranges->top == NULL + && !ospf_vl_count(ospf, area) && area->shortcut_configured == OSPF_SHORTCUT_DEFAULT && area->external_routing == OSPF_AREA_DEFAULT && area->no_summary == 0 && area->default_cost == 1 |