SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

network: drop unused flag and counter

Browse Source
This commit is contained in:
Yu Watanabe
2022-02-26 05:49:52 +09:00
parent b4d6ae63ba
commit b93ce59e51
3 changed files with 2 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/network/netdev/netdev.c
+2 -19
View File
@@ -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);
src/network/networkd-link.c
-3
View File
@@ -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;
}
src/network/networkd-link.h
-2
View File
@@ -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;