From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 2 Oct 2020 08:45:37 +0000 (+0900)
Subject: network: move link_configure_traffic_control()
X-Git-Tag: v247-rc1~117^2~30
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=200543791ab11f1379216650eb7949113974e4a3;p=thirdparty%2Fsystemd.git

network: move link_configure_traffic_control()
---

diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index 10bea3b7ff8..59ac24ccdff 100644
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -2240,27 +2240,6 @@ static int link_drop_config(Link *link) {
         return 0;
 }
 
-static int link_configure_traffic_control(Link *link) {
-        TrafficControl *tc;
-        int r;
-
-        link->tc_configured = false;
-        link->tc_messages = 0;
-
-        ORDERED_HASHMAP_FOREACH(tc, link->network->tc_by_section) {
-                r = traffic_control_configure(link, tc);
-                if (r < 0)
-                        return r;
-        }
-
-        if (link->tc_messages == 0)
-                link->tc_configured = true;
-        else
-                log_link_debug(link, "Configuring traffic control");
-
-        return 0;
-}
-
 static int link_configure_sr_iov(Link *link) {
         SRIOV *sr_iov;
         int r;
diff --git a/src/network/tc/tc.c b/src/network/tc/tc.c
index 30a00133d65..8554716d760 100644
--- a/src/network/tc/tc.c
+++ b/src/network/tc/tc.c
@@ -21,7 +21,7 @@ void traffic_control_free(TrafficControl *tc) {
         }
 }
 
-int traffic_control_configure(Link *link, TrafficControl *tc) {
+static int traffic_control_configure(Link *link, TrafficControl *tc) {
         assert(link);
         assert(tc);
 
@@ -35,6 +35,27 @@ int traffic_control_configure(Link *link, TrafficControl *tc) {
         }
 }
 
+int link_configure_traffic_control(Link *link) {
+        TrafficControl *tc;
+        int r;
+
+        link->tc_configured = false;
+        link->tc_messages = 0;
+
+        ORDERED_HASHMAP_FOREACH(tc, link->network->tc_by_section) {
+                r = traffic_control_configure(link, tc);
+                if (r < 0)
+                        return r;
+        }
+
+        if (link->tc_messages == 0)
+                link->tc_configured = true;
+        else
+                log_link_debug(link, "Configuring traffic control");
+
+        return 0;
+}
+
 int traffic_control_section_verify(TrafficControl *tc, bool *qdisc_has_root, bool *qdisc_has_clsact) {
         assert(tc);
 
diff --git a/src/network/tc/tc.h b/src/network/tc/tc.h
index defa0b774a5..c822359f6ce 100644
--- a/src/network/tc/tc.h
+++ b/src/network/tc/tc.h
@@ -28,5 +28,5 @@ typedef struct TrafficControl {
 #define TC(tc) (&(tc)->meta)
 
 void traffic_control_free(TrafficControl *tc);
-int traffic_control_configure(Link *link, TrafficControl *tc);
+int link_configure_traffic_control(Link *link);
 int traffic_control_section_verify(TrafficControl *tc, bool *qdisc_has_root, bool *qdisc_has_clsact);