From 462877f06016a7fb31865ee882b391c36f07af18 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Fri, 15 Dec 2023 04:30:24 +0900 Subject: [PATCH] network/nexthop: drop dead code Follow-up for a533473a48ff05e84e7af3d4049dbf458b6c0f94. --- src/network/networkd-nexthop.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/src/network/networkd-nexthop.c b/src/network/networkd-nexthop.c index aeb33ae8d60..5d86f19805e 100644 --- a/src/network/networkd-nexthop.c +++ b/src/network/networkd-nexthop.c @@ -555,6 +555,7 @@ static bool nexthop_is_ready_to_configure(Link *link, const NextHop *nexthop) { assert(link); assert(nexthop); + assert(nexthop->id > 0); if (!link_is_ready_to_configure(link, false)) return false; @@ -582,17 +583,6 @@ static bool nexthop_is_ready_to_configure(Link *link, const NextHop *nexthop) { return false; } - if (nexthop->id == 0) { - Request *req; - - ORDERED_SET_FOREACH(req, link->manager->request_queue) { - if (req->type != REQUEST_TYPE_NEXTHOP) - continue; - if (((NextHop*) req->userdata)->id != 0) - return false; /* first configure nexthop with id. */ - } - } - return gateway_is_ready(link, FLAGS_SET(nexthop->flags, RTNH_F_ONLINK), nexthop->family, &nexthop->gw); } -- 2.47.3