]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
network: drop unused variable
authorYu Watanabe <watanabe.yu+github@gmail.com>
Wed, 22 May 2019 02:11:07 +0000 (11:11 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Wed, 22 May 2019 08:59:39 +0000 (17:59 +0900)
src/network/networkd-link.c
src/network/networkd-link.h

index 046996fd84d63feb6576b47a01a0767c77d37e95..9678d4211f53a494e4108dda42892e8f9b7c8687 100644 (file)
@@ -343,9 +343,6 @@ static bool link_is_enslaved(Link *link) {
         if (link->master_ifindex > 0 && link->network->bridge)
                 return true;
 
-        if (!link->enslaved_raw)
-                return false;
-
         /* TODO: add conditions for other netdevs. */
 
         return false;
@@ -2201,7 +2198,6 @@ static int netdev_join_handler(sd_netlink *rtnl, sd_netlink_message *m, Link *li
         assert(link);
         assert(link->network);
         assert(link->enslaving > 0);
-        assert(!link->enslaved_raw);
 
         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");
 
         if (link->enslaving == 0) {
-                link->enslaved_raw = true;
                 link_joined(link);
         }
 
@@ -2237,7 +2232,6 @@ static int link_enter_join_netdev(Link *link) {
 
         link_dirty(link);
         link->enslaving = 0;
-        link->enslaved_raw = false;
 
         if (link->network->bond) {
                 if (link->network->bond->state == NETDEV_STATE_READY &&
index cf7206a6ff51ffbd6d3fdfee9ac9400ba87e36a9..aa50fc66c1242b073d654172e604da011a4054d8 100644 (file)
@@ -67,8 +67,6 @@ typedef struct Link {
         unsigned routing_policy_rule_messages;
         unsigned routing_policy_rule_remove_messages;
         unsigned enslaving;
-        /* link_is_enslaved() has additional checks. So, it is named _raw. */
-        bool enslaved_raw;
 
         Set *addresses;
         Set *addresses_foreign;