Merge pull request #15891 from bluca/host_os_release

[thirdparty/systemd.git] / src / network / tc / fq.c

diff --git a/src/network/tc/fq.c b/src/network/tc/fq.c
index 58a008f4c2e0fdf0d3b1909b070284104ab24a13..f717dc790c7c0bf57ce7cc72d7f2cd1d910ee927 100644 (file)
--- a/src/network/tc/fq.c
+++ b/src/network/tc/fq.c
@@ -9,10 +9,10 @@
 #include "netlink-util.h"
 #include "parse-util.h"
 #include "string-util.h"
-#include "util.h"
+#include "strv.h"
 
-static int fair_queue_traffic_policing_init(QDisc *qdisc) {
-        FairQueueTrafficPolicing *fq;
+static int fair_queueing_init(QDisc *qdisc) {
+        FairQueueing *fq;
 
         assert(qdisc);
 
@@ -24,8 +24,8 @@ static int fair_queue_traffic_policing_init(QDisc *qdisc) {
         return 0;
 }
 
-static int fair_queue_traffic_policing_fill_message(Link *link, QDisc *qdisc, sd_netlink_message *req) {
-        FairQueueTrafficPolicing *fq;
+static int fair_queueing_fill_message(Link *link, QDisc *qdisc, sd_netlink_message *req) {
+        FairQueueing *fq;
         int r;
 
         assert(link);
@@ -102,7 +102,7 @@ static int fair_queue_traffic_policing_fill_message(Link *link, QDisc *qdisc, sd
         return 0;
 }
 
-int config_parse_tc_fair_queue_traffic_policing_u32(
+int config_parse_fair_queueing_u32(
                 const char *unit,
                 const char *filename,
                 unsigned line,
@@ -115,7 +115,7 @@ int config_parse_tc_fair_queue_traffic_policing_u32(
                 void *userdata) {
 
         _cleanup_(qdisc_free_or_set_invalidp) QDisc *qdisc = NULL;
-        FairQueueTrafficPolicing *fq;
+        FairQueueing *fq;
         Network *network = data;
         uint32_t *p;
         int r;
@@ -134,13 +134,13 @@ int config_parse_tc_fair_queue_traffic_policing_u32(
 
         fq = FQ(qdisc);
 
-        if (streq(lvalue, "FairQueueTrafficPolicingPacketLimit"))
+        if (streq(lvalue, "PacketLimit"))
                 p = &fq->packet_limit;
-        else if (streq(lvalue, "FairQueueTrafficPolicingFlowLimit"))
+        else if (streq(lvalue, "FlowLimit"))
                 p = &fq->flow_limit;
-        else if (streq(lvalue, "FairQueueTrafficPolicingBuckets"))
+        else if (streq(lvalue, "Buckets"))
                 p = &fq->buckets;
-        else if (streq(lvalue, "FairQueueTrafficPolicingOrphanMask"))
+        else if (streq(lvalue, "OrphanMask"))
                 p = &fq->orphan_mask;
         else
                 assert_not_reached("Invalid lvalue");
@@ -165,7 +165,7 @@ int config_parse_tc_fair_queue_traffic_policing_u32(
         return 0;
 }
 
-int config_parse_tc_fair_queue_traffic_policing_size(
+int config_parse_fair_queueing_size(
                 const char *unit,
                 const char *filename,
                 unsigned line,
@@ -178,7 +178,7 @@ int config_parse_tc_fair_queue_traffic_policing_size(
                 void *userdata) {
 
         _cleanup_(qdisc_free_or_set_invalidp) QDisc *qdisc = NULL;
-        FairQueueTrafficPolicing *fq;
+        FairQueueing *fq;
         Network *network = data;
         uint64_t sz;
         uint32_t *p;
@@ -198,9 +198,9 @@ int config_parse_tc_fair_queue_traffic_policing_size(
 
         fq = FQ(qdisc);
 
-        if (streq(lvalue, "FairQueueTrafficPolicingQuantum"))
+        if (STR_IN_SET(lvalue, "QuantumBytes", "Quantum"))
                 p = &fq->quantum;
-        else if (streq(lvalue, "FairQueueTrafficPolicingInitialQuantum"))
+        else if (STR_IN_SET(lvalue, "InitialQuantumBytes", "InitialQuantum"))
                 p = &fq->initial_quantum;
         else
                 assert_not_reached("Invalid lvalue");
@@ -232,7 +232,7 @@ int config_parse_tc_fair_queue_traffic_policing_size(
         return 0;
 }
 
-int config_parse_tc_fair_queue_traffic_policing_bool(
+int config_parse_fair_queueing_bool(
                 const char *unit,
                 const char *filename,
                 unsigned line,
@@ -245,7 +245,7 @@ int config_parse_tc_fair_queue_traffic_policing_bool(
                 void *userdata) {
 
         _cleanup_(qdisc_free_or_set_invalidp) QDisc *qdisc = NULL;
-        FairQueueTrafficPolicing *fq;
+        FairQueueing *fq;
         Network *network = data;
         int r;
 
@@ -284,7 +284,7 @@ int config_parse_tc_fair_queue_traffic_policing_bool(
         return 0;
 }
 
-int config_parse_tc_fair_queue_traffic_policing_usec(
+int config_parse_fair_queueing_usec(
                 const char *unit,
                 const char *filename,
                 unsigned line,
@@ -297,7 +297,7 @@ int config_parse_tc_fair_queue_traffic_policing_usec(
                 void *userdata) {
 
         _cleanup_(qdisc_free_or_set_invalidp) QDisc *qdisc = NULL;
-        FairQueueTrafficPolicing *fq;
+        FairQueueing *fq;
         Network *network = data;
         usec_t sec;
         int r;
@@ -343,7 +343,7 @@ int config_parse_tc_fair_queue_traffic_policing_usec(
         return 0;
 }
 
-int config_parse_tc_fair_queue_traffic_policing_max_rate(
+int config_parse_fair_queueing_max_rate(
                 const char *unit,
                 const char *filename,
                 unsigned line,
@@ -356,7 +356,7 @@ int config_parse_tc_fair_queue_traffic_policing_max_rate(
                 void *userdata) {
 
         _cleanup_(qdisc_free_or_set_invalidp) QDisc *qdisc = NULL;
-        FairQueueTrafficPolicing *fq;
+        FairQueueing *fq;
         Network *network = data;
         uint64_t sz;
         int r;
@@ -403,8 +403,8 @@ int config_parse_tc_fair_queue_traffic_policing_max_rate(
 }
 
 const QDiscVTable fq_vtable = {
-        .init = fair_queue_traffic_policing_init,
-        .object_size = sizeof(FairQueueTrafficPolicing),
+        .init = fair_queueing_init,
+        .object_size = sizeof(FairQueueing),
         .tca_kind = "fq",
-        .fill_message = fair_queue_traffic_policing_fill_message,
+        .fill_message = fair_queueing_fill_message,
 };