Merge pull request #16103 from mjstapp/fix_5549_nhg_type

zebra: be consistent about v6 nexthops for v4 routes
This commit is contained in:
Russ White 2024-08-27 09:46:53 -04:00 committed by GitHub
commit 5a6cb0bf75
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -2656,13 +2656,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)