summaryrefslogtreecommitdiffstats
path: root/ospf6d
diff options
context:
space:
mode:
authorRuss White <russ@riw.us>2020-12-15 13:29:10 +0100
committerGitHub <noreply@github.com>2020-12-15 13:29:10 +0100
commit30ff2a502e41a048d5033b5d1f8ac32dd715eddc (patch)
tree4247d39e753067038f10e5a035fdf27028f2609a /ospf6d
parentMerge pull request #7728 from mobash-rasool/pim-fixes (diff)
parentospf6d: ospfv3 disable on the interface, but interface prefix still shown in ... (diff)
downloadfrr-30ff2a502e41a048d5033b5d1f8ac32dd715eddc.tar.xz
frr-30ff2a502e41a048d5033b5d1f8ac32dd715eddc.zip
Merge pull request #7717 from ranjanyash54/2368
ospf6d: ospfv3 disable on the interface, but interface prefix still s…
Diffstat (limited to 'ospf6d')
-rw-r--r--ospf6d/ospf6_top.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/ospf6d/ospf6_top.c b/ospf6d/ospf6_top.c
index e461a3792..7b4ed84d5 100644
--- a/ospf6d/ospf6_top.c
+++ b/ospf6d/ospf6_top.c
@@ -849,7 +849,7 @@ DEFUN (no_ospf6_interface_area,
return CMD_SUCCESS;
}
- thread_execute(master, interface_down, oi, 0);
+ ospf6_interface_disable(oi);
oa = oi->area;
listnode_delete(oi->area->if_list, oi);
@@ -860,6 +860,7 @@ DEFUN (no_ospf6_interface_area,
UNSET_FLAG(oa->flag, OSPF6_AREA_ENABLE);
ospf6_abr_disable_area(oa);
}
+ ospf6_interface_delete(oi);
return CMD_SUCCESS;
}