From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 26 May 2021 04:43:05 +0000 (+0900)
Subject: network: it is not necessary to call RTM_GETLINK when carrier is gained
X-Git-Tag: v249-rc1~76^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0e397560cc69ab8303e519d79d6da2c2903fe17d;p=thirdparty%2Fsystemd.git

network: it is not necessary to call RTM_GETLINK when carrier is gained
---

diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index 848136dc671..75707757443 100644
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -1618,7 +1618,7 @@ static int link_reconfigure_internal(Link *link, bool force) {
         if (r < 0)
                 return r;
 
-        return 0;
+        return 1;
 }
 
 static int link_reconfigure_handler_internal(sd_netlink *rtnl, sd_netlink_message *m, Link *link, bool force) {
@@ -1860,8 +1860,8 @@ static int link_carrier_gained(Link *link) {
         if (r < 0)
                 return r;
         if (r > 0) {
-                r = link_reconfigure(link, false);
-                if (r < 0)
+                r = link_reconfigure_internal(link, false);
+                if (r != 0)
                         return r;
         }