From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sun, 13 Jun 2021 19:32:21 +0000 (+0900)
Subject: network: add missing increment of Link::set_flags_messages
X-Git-Tag: v249-rc1~20^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7149bde4bae8eaa21d6b9d355bffb3cc313d566c;p=thirdparty%2Fsystemd.git

network: add missing increment of Link::set_flags_messages

link_up_or_down() will decrement the counter when the subsequent
RTM_GETLINK netlink method is finished. So, we need to increment
the counter here.

Fixes the issue mentioned at
https://github.com/systemd/systemd/issues/19832#issuecomment-860255692.
---

diff --git a/src/network/networkd-setlink.c b/src/network/networkd-setlink.c
index 478591b5bb5..01a7b3139e0 100644
--- a/src/network/networkd-setlink.c
+++ b/src/network/networkd-setlink.c
@@ -864,7 +864,16 @@ static int link_up_or_down(Link *link, bool up, link_netlink_message_handler_t c
 }
 
 int link_down(Link *link) {
-        return link_up_or_down(link, false, link_down_handler);
+        int r;
+
+        assert(link);
+
+        r = link_up_or_down(link, false, link_down_handler);
+        if (r < 0)
+                return log_link_error_errno(link, r, "Failed to bring down interface: %m");
+
+        link->set_flags_messages++;
+        return 0;
 }
 
 static bool link_is_ready_to_activate(Link *link) {