shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-24 21:34:08 +03:00
Code

network: drop unused variable

Browse Source
This commit is contained in:
Yu Watanabe 2019-05-22 11:11:07 +09:00
parent bb262ef02b
commit a0ae96149a
2 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/network/networkd-link.c
View File

@ -343,9 +343,6 @@ static bool link_is_enslaved(Link *link) {
if (link->master_ifindex > 0 && link->network->bridge) if (link->master_ifindex > 0 && link->network->bridge)
return true; return true;
if (!link->enslaved_raw)
return false;
/* TODO: add conditions for other netdevs. */ /* TODO: add conditions for other netdevs. */
return false; return false;
@ -2201,7 +2198,6 @@ static int netdev_join_handler(sd_netlink *rtnl, sd_netlink_message *m, Link *li
assert(link); assert(link);
assert(link->network); assert(link->network);
assert(link->enslaving > 0); assert(link->enslaving > 0);
assert(!link->enslaved_raw);
link->enslaving--; link->enslaving--;
@ -2217,7 +2213,6 @@ static int netdev_join_handler(sd_netlink *rtnl, sd_netlink_message *m, Link *li
log_link_debug(link, "Joined netdev"); log_link_debug(link, "Joined netdev");
if (link->enslaving == 0) { if (link->enslaving == 0) {
link->enslaved_raw = true;
link_joined(link); link_joined(link);
} }
@ -2237,7 +2232,6 @@ static int link_enter_join_netdev(Link *link) {
link_dirty(link); link_dirty(link);
link->enslaving = 0; link->enslaving = 0;
link->enslaved_raw = false;
if (link->network->bond) { if (link->network->bond) {
if (link->network->bond->state == NETDEV_STATE_READY && if (link->network->bond->state == NETDEV_STATE_READY &&

2
src/network/networkd-link.h
View File

@ -67,8 +67,6 @@ typedef struct Link {
unsigned routing_policy_rule_messages; unsigned routing_policy_rule_messages;
unsigned routing_policy_rule_remove_messages; unsigned routing_policy_rule_remove_messages;
unsigned enslaving; unsigned enslaving;
/* link_is_enslaved() has additional checks. So, it is named _raw. */
bool enslaved_raw;
Set *addresses; Set *addresses;
Set *addresses_foreign; Set *addresses_foreign;