Merge pull request #14588 from FRRouting/mergify/bp/stable/9.0/pr-13340

zebra: Fix connected route deletion when multiple entry exists (backport #13340)
FRRouting · Oct 13, 2023 · 633a030 · 633a030
2 parents 03fc69d + f9e82d1
commit 633a030
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c
@@ -2948,8 +2948,8 @@ static void process_subq_early_route_delete(struct zebra_early_route *ere)
 
 	struct nexthop *nh = NULL;
 
-	if (ere->re->nhe)
-		nh = ere->re->nhe->nhg.nexthop;
+	if (ere->re_nhe)
+		nh = ere->re_nhe->nhg.nexthop;
 
 	/* Lookup same type route. */
 	RNODE_FOREACH_RE (rn, re) {
@@ -2967,7 +2967,8 @@ static void process_subq_early_route_delete(struct zebra_early_route *ere)
 		if (re->type == ZEBRA_ROUTE_KERNEL &&
 		    re->metric != ere->re->metric)
 			continue;
-		if (re->type == ZEBRA_ROUTE_CONNECT && (rtnh = nh) &&
+		if (re->type == ZEBRA_ROUTE_CONNECT &&
+		    (rtnh = re->nhe->nhg.nexthop) &&
 		    rtnh->type == NEXTHOP_TYPE_IFINDEX && nh) {
 			if (rtnh->ifindex != nh->ifindex)
 				continue;