From: Christian Franke <chris@opensourcerouting.org>
Date: Fri, 9 Nov 2018 15:40:17 +0000 (+0100)
Subject: fabricd: never flood back through the incoming interface
X-Git-Tag: frr-7.1-dev~213^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=refs%2Fpull%2F3304%2Fhead;p=mirror%2Ffrr.git

fabricd: never flood back through the incoming interface

Signed-off-by: Christian Franke <chris@opensourcerouting.org>
---

diff --git a/isisd/isis_lsp.c b/isisd/isis_lsp.c
index bb090f42ed..4f4d0f7172 100644
--- a/isisd/isis_lsp.c
+++ b/isisd/isis_lsp.c
@@ -1999,13 +1999,13 @@ void lsp_set_all_srmflags(struct isis_lsp *lsp, bool set)
 
 void lsp_flood(struct isis_lsp *lsp, struct isis_circuit *circuit)
 {
-	if (!fabricd) {
+	if (!fabricd)
 		lsp_set_all_srmflags(lsp, true);
-		if (circuit)
-			isis_tx_queue_del(circuit->tx_queue, lsp);
-	} else {
+	else
 		fabricd_lsp_flood(lsp);
-	}
+
+	if (circuit)
+		isis_tx_queue_del(circuit->tx_queue, lsp);
 }
 
 static int lsp_handle_adj_state_change(struct isis_adjacency *adj)