mirror of
https://gitlab.nic.cz/labs/bird.git
synced 2024-12-22 09:41:54 +00:00
Merge commit 'v2.14-32-gcaa9460a' into mq-merge-step-2
This commit is contained in:
commit
9b731089b5
@ -1796,7 +1796,12 @@ calc_next_hop(struct ospf_area *oa, struct top_hash_entry *en,
|
||||
if (ifa->type == OSPF_IT_VLINK)
|
||||
return new_nexthop(p, IPA_NONE, NULL, 0);
|
||||
|
||||
/* FIXME: On physical PtP links we may skip next-hop altogether */
|
||||
/*
|
||||
* The type of the ospf_iface is PtP and the iface is a physical PtP link,
|
||||
* so we can simply use the iface, and skip further resolving.
|
||||
*/
|
||||
if (ifa->type == OSPF_IT_PTP && !(ifa->iface->flags & IF_MULTIACCESS))
|
||||
return new_nexthop(p, IPA_NONE, ifa->iface, ifa->ecmp_weight);
|
||||
|
||||
if (ospf_is_v2(p) || ospf_is_ip6(p))
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user