From 0221ed29176b3944125790ae47b9a701db90c808 Mon Sep 17 00:00:00 2001 From: Mark Stapp Date: Wed, 29 May 2024 08:50:35 -0400 Subject: [PATCH] zebra: be consistent about v6 nexthops for v4 routes Treat TYPE_IPV6 and TYPE_IPV6_IFINDEX nexthops the same way when processing v4 (RFC 5549) routes. Signed-off-by: Mark Stapp --- zebra/zebra_nhg.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/zebra/zebra_nhg.c b/zebra/zebra_nhg.c index b4e25daad817..048e4126f9d0 100644 --- a/zebra/zebra_nhg.c +++ b/zebra/zebra_nhg.c @@ -2642,13 +2642,6 @@ static unsigned nexthop_active_check(struct route_node *rn, UNSET_FLAG(nexthop->flags, NEXTHOP_FLAG_ACTIVE); break; case NEXTHOP_TYPE_IPV6: - family = AFI_IP6; - if (nexthop_active(nexthop, nhe, &rn->p, re->type, re->flags, - &mtu, vrf_id)) - SET_FLAG(nexthop->flags, NEXTHOP_FLAG_ACTIVE); - else - UNSET_FLAG(nexthop->flags, NEXTHOP_FLAG_ACTIVE); - break; case NEXTHOP_TYPE_IPV6_IFINDEX: /* RFC 5549, v4 prefix with v6 NH */ if (rn->p.family != AF_INET)