From 42d9660f10e928bfb575712b1a01773bbf8cf86f Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Tue, 12 Nov 2024 02:06:21 +0900 Subject: [PATCH] network/ndisc: several cleanups for ndisc_remove_route() - drop unnecessary call of ndisc_set_route_priority() at the beginning, as it is called later in the loop below, - use RET_GATHER() and remove all possible routes even if failed. --- src/network/networkd-ndisc.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/network/networkd-ndisc.c b/src/network/networkd-ndisc.c index 3b130ee4ccf..698fdbdb032 100644 --- a/src/network/networkd-ndisc.c +++ b/src/network/networkd-ndisc.c @@ -292,14 +292,12 @@ static int ndisc_request_router_route(Route *route, Link *link, sd_ndisc_router } static int ndisc_remove_route(Route *route, Link *link) { - int r; + int r, ret = 0; assert(route); assert(link); assert(link->manager); - ndisc_set_route_priority(link, route); - if (!route->table_set) route->table = link_get_ndisc_route_table(link); @@ -331,9 +329,7 @@ static int ndisc_remove_route(Route *route, Link *link) { if (existing->source == NETWORK_CONFIG_SOURCE_STATIC) continue; - r = route_remove_and_cancel(existing, link->manager); - if (r < 0) - return r; + RET_GATHER(ret, route_remove_and_cancel(existing, link->manager)); } /* Then, check if the route exists. */ @@ -341,13 +337,11 @@ static int ndisc_remove_route(Route *route, Link *link) { if (existing->source == NETWORK_CONFIG_SOURCE_STATIC) continue; - r = route_remove_and_cancel(existing, link->manager); - if (r < 0) - return r; + RET_GATHER(ret, route_remove_and_cancel(existing, link->manager)); } } - return 0; + return ret; } static int ndisc_address_handler(sd_netlink *rtnl, sd_netlink_message *m, Request *req, Link *link, Address *address) { -- 2.47.3