From: Yash Ranjan <ranjany@vmware.com>
Date: Wed, 4 Aug 2021 11:53:10 +0000 (-0700)
Subject: ospf6d: Check the cost only when asbr_present for ECMP routes
X-Git-Tag: frr-8.0.1~21^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=f4a96f9731a3315b2bb7a8946b44b694057b8b98;p=matthieu%2Ffrr.git

ospf6d: Check the cost only when asbr_present for ECMP routes

For ECMP routes, the metric cost and metric type are compared
even when the asbr entry is not present. This stops the routes
from getting removed when max age LSAs are received for the
ECMP routes.

Signed-off-by: Yash Ranjan <ranjany@vmware.com>
(cherry picked from commit a867da2b6b1ab39a95ca30763aa27d0f66dad15e)
---

diff --git a/ospf6d/ospf6_asbr.c b/ospf6d/ospf6_asbr.c
index e5b274d066..544bfe6ae4 100644
--- a/ospf6d/ospf6_asbr.c
+++ b/ospf6d/ospf6_asbr.c
@@ -673,7 +673,7 @@ void ospf6_asbr_lsa_remove(struct ospf6_lsa *lsa,
 				/* Compare LSA cost with current
 				 * route info.
 				 */
-				if (!asbr_entry
+				if (asbr_entry
 				    && (o_path->cost != route_to_del->path.cost
 					|| o_path->u.cost_e2
 						   != route_to_del->path.u