From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 12 Mar 2024 08:28:43 +0000 (+0900)
Subject: network: introduce link_requeue_request()
X-Git-Tag: v256-rc1~522
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=134fe8d27495eeb74636ce914e25c8102e07b29d;p=thirdparty%2Fsystemd.git

network: introduce link_requeue_request()
---

diff --git a/src/network/networkd-queue.c b/src/network/networkd-queue.c
index f1dd6b44d25..98c629f161d 100644
--- a/src/network/networkd-queue.c
+++ b/src/network/networkd-queue.c
@@ -216,6 +216,23 @@ int link_queue_request_full(
                            process, counter, netlink_handler, ret);
 }
 
+int link_requeue_request(Link *link, Request *req, void *userdata, Request **ret) {
+        assert(link);
+        assert(req);
+
+        return link_queue_request_full(
+                        link,
+                        req->type,
+                        userdata,
+                        req->free_func,
+                        req->hash_func,
+                        req->compare_func,
+                        req->process,
+                        req->counter,
+                        req->netlink_handler,
+                        ret);
+}
+
 int manager_process_requests(Manager *manager) {
         Request *req;
         int r;
diff --git a/src/network/networkd-queue.h b/src/network/networkd-queue.h
index bdedc775377..e35cd73efd9 100644
--- a/src/network/networkd-queue.h
+++ b/src/network/networkd-queue.h
@@ -107,6 +107,8 @@ int link_queue_request_full(
                 request_netlink_handler_t netlink_handler,
                 Request **ret);
 
+int link_requeue_request(Link *link, Request *req, void *userdata, Request **ret);
+
 static inline int link_queue_request(
                 Link *link,
                 RequestType type,
diff --git a/src/network/networkd-route.c b/src/network/networkd-route.c
index 3c5de98e7c9..efe378a4572 100644
--- a/src/network/networkd-route.c
+++ b/src/network/networkd-route.c
@@ -780,16 +780,7 @@ static int route_requeue_request(Request *req, Link *link, const Route *route) {
         request_detach(req);
 
         /* Request the route with the adjusted Route object combined with the same other parameters. */
-        r = link_queue_request_full(link,
-                                    req->type,
-                                    tmp,
-                                    req->free_func,
-                                    req->hash_func,
-                                    req->compare_func,
-                                    req->process,
-                                    req->counter,
-                                    req->netlink_handler,
-                                    NULL);
+        r = link_requeue_request(link, req, tmp, NULL);
         if (r < 0)
                 return r;
         if (r == 0)