]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
network: move link_configure_traffic_control()
authorYu Watanabe <watanabe.yu+github@gmail.com>
Fri, 2 Oct 2020 08:45:37 +0000 (17:45 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Tue, 6 Oct 2020 17:50:50 +0000 (02:50 +0900)
src/network/networkd-link.c
src/network/tc/tc.c
src/network/tc/tc.h

index 10bea3b7ff834d26790b4b5d1f93a6ab3e873030..59ac24ccdffeddeb864b8bbbd9b24e0576589284 100644 (file)
@@ -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;
index 30a00133d6579a9dbfe54956ef04ccf8bdfbd463..8554716d7605fb2c359a430ca70f0c6c62c55734 100644 (file)
@@ -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);
 
index defa0b774a5786a52064ab06910a3b514dfe1d50..c822359f6ce52ec189588265bdfa95908e16d5c3 100644 (file)
@@ -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);