From: Philippe Guibert <philippe.guibert@6wind.com>
Date: Fri, 4 May 2018 11:49:56 +0000 (+0200)
Subject: zebra: avoid inactivating twice an interface
X-Git-Tag: frr-6.1-dev~453^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=7befff57dffd2e6ed10881cf4b72c7dc10df62c6;p=mirror%2Ffrr.git

zebra: avoid inactivating twice an interface

This code is a sanity check to avoid double unlink of interface.

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
---

diff --git a/zebra/interface.c b/zebra/interface.c
index fc44be34ea..a785186e3d 100644
--- a/zebra/interface.c
+++ b/zebra/interface.c
@@ -726,6 +726,9 @@ void if_delete_update(struct interface *ifp)
 		return;
 	}
 
+	if (!CHECK_FLAG(ifp->status, ZEBRA_INTERFACE_ACTIVE))
+		return;
+
 	/* Mark interface as inactive */
 	UNSET_FLAG(ifp->status, ZEBRA_INTERFACE_ACTIVE);