Merge pull request #21638 from yuwata/network-dhcp6pd-prefix-lost

network: dhcp6pd: fix prefix lost handling

1 files changed, 7 insertions, 6 deletions

diff --git a/src/network/networkd-route.c b/src/network/networkd-route.c
index 003c8dcde4..8e4081a8e3 100644
--- a/src/network/networkd-route.c
+++ b/src/network/networkd-route.c
@@ -1260,24 +1260,25 @@ static int route_configure(
         return 0;
 }
 
-void route_cancel_request(Route *route) {
+void route_cancel_request(Route *route, Link *link) {
         Request req;
 
         assert(route);
 
-        if (!route_is_requesting(route))
-                return;
+        link = route->link ?: link;
 
-        if (!route->link)
+        assert(link);
+
+        if (!route_is_requesting(route))
                 return;
 
         req = (Request) {
-                .link = route->link,
+                .link = link,
                 .type = REQUEST_TYPE_ROUTE,
                 .route = route,
         };
 
-        request_drop(ordered_set_get(route->link->manager->request_queue, &req));
+        request_drop(ordered_set_get(link->manager->request_queue, &req));
         route_cancel_requesting(route);
 }