From: Yash Ranjan <ranjany@vmware.com>
Date: Tue, 1 Dec 2020 06:21:04 +0000 (-0800)
Subject: ospf6d: ospfv3 disable on the interface, but interface prefix still shown in the... 
X-Git-Tag: base_7.6~121^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=refs%2Fpull%2F7717%2Fhead;p=mirror%2Ffrr.git

ospf6d: ospfv3 disable on the interface, but interface prefix still shown in the output

When the ospfv3 interface is disabled by the command "no interface <eth> area <area-id>
the linked interface prefixes does not get flushed

Signed-off-by: Yash Ranjan <ranjany@vmware.com>
---

diff --git a/ospf6d/ospf6_top.c b/ospf6d/ospf6_top.c
index e461a37923..7b4ed84d53 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;
 }