From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 7 Sep 2021 09:20:31 +0000 (+0900)
Subject: network: drop unused features in request queue
X-Git-Tag: v250-rc1~590^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b8355de49eb96866490a027df6a6b7680f4fd7fc;p=thirdparty%2Fsystemd.git

network: drop unused features in request queue
---

diff --git a/src/network/networkd-queue.c b/src/network/networkd-queue.c
index dcf5f4f0527..8cd5300ce60 100644
--- a/src/network/networkd-queue.c
+++ b/src/network/networkd-queue.c
@@ -70,9 +70,6 @@ static Request *request_free(Request *req) {
                 /* To prevent from triggering assertions in hash functions, remove this request before
                  * freeing object below. */
                 ordered_set_remove(req->link->manager->request_queue, req);
-        if (req->on_free)
-                /* on_free() may use object. So, let's call this earlier. */
-                req->on_free(req);
         if (req->consume_object)
                 request_free_object(req->type, req->object);
         link_unref(req->link);
diff --git a/src/network/networkd-queue.h b/src/network/networkd-queue.h
index b1c0a9f0d4e..c0cdacfbd80 100644
--- a/src/network/networkd-queue.h
+++ b/src/network/networkd-queue.h
@@ -15,11 +15,6 @@ typedef struct NextHop NextHop;
 typedef struct Route Route;
 typedef struct RoutingPolicyRule RoutingPolicyRule;
 
-typedef struct Request Request;
-
-typedef int (*request_after_configure_handler_t)(Request*, void*);
-typedef void (*request_on_free_handler_t)(Request*);
-
 typedef enum RequestType {
         REQUEST_TYPE_ACTIVATE_LINK,
         REQUEST_TYPE_ADDRESS,
@@ -63,8 +58,6 @@ typedef struct Request {
         void *userdata;
         unsigned *message_counter;
         link_netlink_message_handler_t netlink_handler;
-        request_after_configure_handler_t after_configure;
-        request_on_free_handler_t on_free;
 } Request;
 
 void request_drop(Request *req);