From 8ce0e517ed23c9d2b5f0855b21eec65ce93d3b90 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Mon, 30 Jan 2023 13:53:44 -0500 Subject: [PATCH] zebra: Send nht resolved entry up to concerned protocols in all cases There existed the idea, from Volta, that a nexthop group would not have the same nexthops installed -vs- what FRR actually sent down. The dplane would notify you. With the addition of 06525c4f99d4dcafdf448565f7e11bd70993697d the code was put behind a bit of a wall controlled the usage of it. The flag ROUTE_ENTRY_USE_FIB_NHG flag was being used to control which set was being sent up to concerned parties in nexthop tracking. Put this flag behind the wall and do not necessarily set it when we receive a data plane notification about a route being installed or not. Fixes: #12706 Signed-off-by: Donald Sharp --- zebra/zebra_rib.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c index fb684c3ecc..2f71a10d3d 100644 --- a/zebra/zebra_rib.c +++ b/zebra/zebra_rib.c @@ -1788,9 +1788,12 @@ no_nexthops: ctxnhg->nexthop != NULL ? "" : " (empty)"); /* Set the flag about the dedicated fib list */ - SET_FLAG(re->status, ROUTE_ENTRY_USE_FIB_NHG); - if (ctxnhg->nexthop) - copy_nexthops(&(re->fib_ng.nexthop), ctxnhg->nexthop, NULL); + if (zrouter.asic_notification_nexthop_control) { + SET_FLAG(re->status, ROUTE_ENTRY_USE_FIB_NHG); + if (ctxnhg->nexthop) + copy_nexthops(&(re->fib_ng.nexthop), ctxnhg->nexthop, + NULL); + } check_backups: