From d21a508e8d9210f5b3b60d8fc8b79a344d4a7440 Mon Sep 17 00:00:00 2001 From: Ondrej Zajicek Date: Thu, 21 Mar 2024 15:59:26 +0100 Subject: [PATCH] Revert "OSPF: On physical PtP links, skip next-hop resolving" This reverts commit 31aa62ae6d2e111e87c08b4b27a16ead968f0689. --- proto/ospf/rt.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/proto/ospf/rt.c b/proto/ospf/rt.c index efcd4e17..471bb586 100644 --- a/proto/ospf/rt.c +++ b/proto/ospf/rt.c @@ -1796,12 +1796,7 @@ 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); - /* - * 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); + /* FIXME: On physical PtP links we may skip next-hop altogether */ if (ospf_is_v2(p) || ospf_is_ip6(p)) {