summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYu Watanabe <watanabe.yu+github@gmail.com>2022-02-24 11:06:29 +0900
committerYu Watanabe <watanabe.yu+github@gmail.com>2022-02-26 05:49:52 +0900
commitb93ce59e51203c3e30bcec0555fc43a906423470 (patch)
tree77925eea8fc9150a218e58e9828cfa21dda9f8fe
parentb4d6ae63ba744f23487a3b7e067eab15494fa848 (diff)
downloadsystemd-b93ce59e51203c3e30bcec0555fc43a906423470.tar.gz
network: drop unused flag and counter
-rw-r--r--src/network/netdev/netdev.c21
-rw-r--r--src/network/networkd-link.c3
-rw-r--r--src/network/networkd-link.h2
3 files changed, 2 insertions, 24 deletions
diff --git a/src/network/netdev/netdev.c b/src/network/netdev/netdev.c
index 6087e3334c..10df9a27da 100644
--- a/src/network/netdev/netdev.c
+++ b/src/network/netdev/netdev.c
@@ -707,19 +707,6 @@ static int link_create_stacked_netdev_handler(sd_netlink *rtnl, sd_netlink_messa
}
static int link_create_stacked_netdev_after_configured_handler(sd_netlink *rtnl, sd_netlink_message *m, Link *link) {
- assert(link);
- assert(link->create_stacked_netdev_after_configured_messages > 0);
-
- link->create_stacked_netdev_after_configured_messages--;
-
- if (link_create_stacked_netdev_handler_internal(rtnl, m, link) <= 0)
- return 0;
-
- if (link->create_stacked_netdev_after_configured_messages == 0) {
- link->stacked_netdevs_after_configured_created = true;
- log_link_debug(link, "Stacked netdevs created.");
- }
-
return 0;
}
@@ -741,13 +728,9 @@ int link_request_stacked_netdev(Link *link, NetDev *netdev) {
&link->create_stacked_netdev_messages,
link_create_stacked_netdev_handler,
NULL);
- } else {
- link->stacked_netdevs_after_configured_created = false;
+ } else
r = link_queue_request(link, REQUEST_TYPE_NETDEV_STACKED, netdev_ref(netdev), true,
- &link->create_stacked_netdev_after_configured_messages,
- link_create_stacked_netdev_after_configured_handler,
- NULL);
- }
+ NULL, link_create_stacked_netdev_after_configured_handler, NULL);
if (r < 0)
return log_link_error_errno(link, r, "Failed to request stacked netdev '%s': %m",
netdev->ifname);
diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index 121b4d5e0a..e46f209e7a 100644
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -562,7 +562,6 @@ static int link_request_stacked_netdevs(Link *link) {
assert(link);
link->stacked_netdevs_created = false;
- link->stacked_netdevs_after_configured_created = false;
HASHMAP_FOREACH(netdev, link->network->stacked_netdevs) {
r = link_request_stacked_netdev(link, netdev);
@@ -574,8 +573,6 @@ static int link_request_stacked_netdevs(Link *link) {
link->stacked_netdevs_created = true;
link_check_ready(link);
}
- if (link->create_stacked_netdev_after_configured_messages == 0)
- link->stacked_netdevs_after_configured_created = true;
return 0;
}
diff --git a/src/network/networkd-link.h b/src/network/networkd-link.h
index 1a3231efc0..645a8e7147 100644
--- a/src/network/networkd-link.h
+++ b/src/network/networkd-link.h
@@ -108,7 +108,6 @@ typedef struct Link {
unsigned set_link_messages;
unsigned set_flags_messages;
unsigned create_stacked_netdev_messages;
- unsigned create_stacked_netdev_after_configured_messages;
Set *addresses;
Set *neighbors;
@@ -142,7 +141,6 @@ typedef struct Link {
bool activated:1;
bool master_set:1;
bool stacked_netdevs_created:1;
- bool stacked_netdevs_after_configured_created:1;
sd_dhcp_server *dhcp_server;