summaryrefslogtreecommitdiff
path: root/zebra/zebra_nhg.c
diff options
context:
space:
mode:
authorRuss White <russ@riw.us>2024-08-27 09:46:53 -0400
committerGitHub <noreply@github.com>2024-08-27 09:46:53 -0400
commit5a6cb0bf75231e42927f60f20996f85e168bd1bf (patch)
tree60ad0fafc85200c5ac835742ae2ccad494f0123b /zebra/zebra_nhg.c
parent17fffbad1b355c6fee055f49382f2200b5138340 (diff)
parent0221ed29176b3944125790ae47b9a701db90c808 (diff)
Merge pull request #16103 from mjstapp/fix_5549_nhg_type
zebra: be consistent about v6 nexthops for v4 routes
Diffstat (limited to 'zebra/zebra_nhg.c')
-rw-r--r--zebra/zebra_nhg.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/zebra/zebra_nhg.c b/zebra/zebra_nhg.c
index 96807356d6..27b7f6340b 100644
--- a/zebra/zebra_nhg.c
+++ b/zebra/zebra_nhg.c
@@ -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)