From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sat, 12 Jun 2021 02:46:01 +0000 (+0900)
Subject: network: add brief comment about reconfiguring interfaces
X-Git-Tag: v249-rc1~20^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7f80fa12c2f4f2a1f0e6bf04a3abd7634f4605ab;p=thirdparty%2Fsystemd.git

network: add brief comment about reconfiguring interfaces

This also renames link_reconfigure_internal() -> link_reconfigure_impl().
---

diff --git a/src/network/networkd-link-bus.c b/src/network/networkd-link-bus.c
index 7be333eac62..50c3f600804 100644
--- a/src/network/networkd-link-bus.c
+++ b/src/network/networkd-link-bus.c
@@ -667,7 +667,7 @@ int bus_link_method_reconfigure(sd_bus_message *message, void *userdata, sd_bus_
         if (r == 0)
                 return 1; /* Polkit will call us back */
 
-        r = link_reconfigure(l, true);
+        r = link_reconfigure(l, /* force = */ true);
         if (r < 0)
                 return r;
         if (r > 0) {
diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index f603058ea03..3376a2f3e11 100644
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -1199,7 +1199,7 @@ static int link_get_network(Link *link, Network **ret) {
         return -ENOENT;
 }
 
-static int link_reconfigure_internal(Link *link, bool force) {
+static int link_reconfigure_impl(Link *link, bool force) {
         Network *network;
         int r;
 
@@ -1267,7 +1267,7 @@ static int link_reconfigure_handler_internal(sd_netlink *rtnl, sd_netlink_messag
         if (r <= 0)
                 return r;
 
-        r = link_reconfigure_internal(link, force);
+        r = link_reconfigure_impl(link, force);
         if (r < 0)
                 link_enter_failed(link);
 
@@ -1501,7 +1501,9 @@ static int link_carrier_gained(Link *link) {
         if (r < 0)
                 return r;
         if (r > 0) {
-                r = link_reconfigure_internal(link, false);
+                /* All link information is up-to-date. So, it is not necessary to call RTM_GETLINK
+                 * netlink method again. */
+                r = link_reconfigure_impl(link, /* force = */ false);
                 if (r != 0)
                         return r;
         }
diff --git a/src/network/networkd-manager-bus.c b/src/network/networkd-manager-bus.c
index 4be09d98d84..a1520240d71 100644
--- a/src/network/networkd-manager-bus.c
+++ b/src/network/networkd-manager-bus.c
@@ -216,7 +216,7 @@ static int bus_method_reload(sd_bus_message *message, void *userdata, sd_bus_err
                 return r;
 
         HASHMAP_FOREACH(link, manager->links) {
-                r = link_reconfigure(link, false);
+                r = link_reconfigure(link, /* force = */ false);
                 if (r < 0)
                         return r;
         }