From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Mon, 14 Feb 2022 17:20:36 +0000 (+0900)
Subject: network: rename REQUEST_TYPE_STACKED_NETDEV -> REQUEST_TYPE_NETDEV_STACKED
X-Git-Tag: v251-rc1~280^2~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=709055dabbb64ab48f54234b45de169ed66a7d33;p=thirdparty%2Fsystemd.git

network: rename REQUEST_TYPE_STACKED_NETDEV -> REQUEST_TYPE_NETDEV_STACKED
---

diff --git a/src/network/netdev/netdev.c b/src/network/netdev/netdev.c
index 18d118e230b..a40a93d6614 100644
--- a/src/network/netdev/netdev.c
+++ b/src/network/netdev/netdev.c
@@ -649,7 +649,7 @@ int request_process_stacked_netdev(Request *req) {
 
         assert(req);
         assert(req->link);
-        assert(req->type == REQUEST_TYPE_STACKED_NETDEV);
+        assert(req->type == REQUEST_TYPE_NETDEV_STACKED);
         assert(req->netdev);
         assert(req->netlink_handler);
 
@@ -731,13 +731,13 @@ int link_request_stacked_netdev(Link *link, NetDev *netdev) {
 
         if (netdev_get_create_type(netdev) == NETDEV_CREATE_STACKED) {
                 link->stacked_netdevs_created = false;
-                r = link_queue_request(link, REQUEST_TYPE_STACKED_NETDEV, netdev, false,
+                r = link_queue_request(link, REQUEST_TYPE_NETDEV_STACKED, netdev, false,
                                        &link->create_stacked_netdev_messages,
                                        link_create_stacked_netdev_handler,
                                        NULL);
         } else {
                 link->stacked_netdevs_after_configured_created = false;
-                r = link_queue_request(link, REQUEST_TYPE_STACKED_NETDEV, netdev, false,
+                r = link_queue_request(link, REQUEST_TYPE_NETDEV_STACKED, netdev, false,
                                        &link->create_stacked_netdev_after_configured_messages,
                                        link_create_stacked_netdev_after_configured_handler,
                                        NULL);
diff --git a/src/network/networkd-queue.c b/src/network/networkd-queue.c
index d673c2f1550..eaaaf7d7e6d 100644
--- a/src/network/networkd-queue.c
+++ b/src/network/networkd-queue.c
@@ -46,6 +46,8 @@ static void request_free_object(RequestType type, void *object) {
         case REQUEST_TYPE_NEIGHBOR:
                 neighbor_free(object);
                 break;
+        case REQUEST_TYPE_NETDEV_STACKED:
+                break;
         case REQUEST_TYPE_NEXTHOP:
                 nexthop_free(object);
                 break;
@@ -58,7 +60,6 @@ static void request_free_object(RequestType type, void *object) {
                 routing_policy_rule_free(object);
                 break;
         case REQUEST_TYPE_SET_LINK:
-        case REQUEST_TYPE_STACKED_NETDEV:
                 break;
         case REQUEST_TYPE_TRAFFIC_CONTROL:
                 traffic_control_free(object);
@@ -114,7 +115,7 @@ static void request_hash_func(const Request *req, struct siphash *state) {
         case REQUEST_TYPE_ADDRESS_LABEL:
         case REQUEST_TYPE_BRIDGE_FDB:
         case REQUEST_TYPE_BRIDGE_MDB:
-        case REQUEST_TYPE_STACKED_NETDEV:
+        case REQUEST_TYPE_NETDEV_STACKED:
                 /* TODO: Currently, these types do not have any specific hash and compare functions.
                  * Fortunately, all these objects are 'static', thus we can use the trivial functions. */
                 trivial_hash_func(req->object, state);
@@ -182,7 +183,7 @@ static int request_compare_func(const struct Request *a, const struct Request *b
         case REQUEST_TYPE_ADDRESS_LABEL:
         case REQUEST_TYPE_BRIDGE_FDB:
         case REQUEST_TYPE_BRIDGE_MDB:
-        case REQUEST_TYPE_STACKED_NETDEV:
+        case REQUEST_TYPE_NETDEV_STACKED:
                 return trivial_compare_func(a->object, b->object);
         case REQUEST_TYPE_DHCP_SERVER:
         case REQUEST_TYPE_DHCP4_CLIENT:
@@ -340,6 +341,9 @@ int manager_process_requests(sd_event_source *s, void *userdata) {
                         case REQUEST_TYPE_NEIGHBOR:
                                 r = request_process_neighbor(req);
                                 break;
+                        case REQUEST_TYPE_NETDEV_STACKED:
+                                r = request_process_stacked_netdev(req);
+                                break;
                         case REQUEST_TYPE_NEXTHOP:
                                 r = request_process_nexthop(req);
                                 break;
@@ -355,9 +359,6 @@ int manager_process_requests(sd_event_source *s, void *userdata) {
                         case REQUEST_TYPE_SET_LINK:
                                 r = request_process_set_link(req);
                                 break;
-                        case REQUEST_TYPE_STACKED_NETDEV:
-                                r = request_process_stacked_netdev(req);
-                                break;
                         case REQUEST_TYPE_TRAFFIC_CONTROL:
                                 r = request_process_traffic_control(req);
                                 break;
diff --git a/src/network/networkd-queue.h b/src/network/networkd-queue.h
index ac02b9d8159..e1dc0a063a3 100644
--- a/src/network/networkd-queue.h
+++ b/src/network/networkd-queue.h
@@ -28,12 +28,12 @@ typedef enum RequestType {
         REQUEST_TYPE_IPV6_PROXY_NDP,
         REQUEST_TYPE_NDISC,
         REQUEST_TYPE_NEIGHBOR,
+        REQUEST_TYPE_NETDEV_STACKED,
         REQUEST_TYPE_NEXTHOP,
         REQUEST_TYPE_RADV,
         REQUEST_TYPE_ROUTE,
         REQUEST_TYPE_ROUTING_POLICY_RULE,
         REQUEST_TYPE_SET_LINK,
-        REQUEST_TYPE_STACKED_NETDEV,
         REQUEST_TYPE_TRAFFIC_CONTROL,
         REQUEST_TYPE_UP_DOWN,
         _REQUEST_TYPE_MAX,