network: also change fair_queue_traffic_policing→fair_queueing

Follow-up for ca58d00c68bce8ac33439fccd81491bf04205fc5. I messed
up the "ing" suffix in the regex when doing the initial patch.

diff --git a/src/network/networkd-network-gperf.gperf b/src/network/networkd-network-gperf.gperf
index 67971534180a76482f9368df86305adc0865aed1..369631d9ee2c5c077fb708d267ecfbfb6a8c2d82 100644 (file)
--- a/src/network/networkd-network-gperf.gperf
+++ b/src/network/networkd-network-gperf.gperf
@@ -258,15 +258,15 @@ ControlledDelay.IntervalSec,                 config_parse_controlled_delay_usec,
 ControlledDelay.CEThresholdSec,              config_parse_controlled_delay_usec,                       QDISC_KIND_CODEL,              0
 ControlledDelay.ECN,                         config_parse_controlled_delay_bool,                       QDISC_KIND_CODEL,              0
 FairQueueing.Parent,                         config_parse_qdisc_parent,                                QDISC_KIND_FQ,                 0
-FairQueueing.PacketLimit,                    config_parse_fair_queue_traffic_policing_u32,             QDISC_KIND_FQ,                 0
-FairQueueing.FlowLimit,                      config_parse_fair_queue_traffic_policing_u32,             QDISC_KIND_FQ,                 0
-FairQueueing.Quantum,                        config_parse_fair_queue_traffic_policing_size,            QDISC_KIND_FQ,                 0
-FairQueueing.InitialQuantum,                 config_parse_fair_queue_traffic_policing_size,            QDISC_KIND_FQ,                 0
-FairQueueing.MaximumRate,                    config_parse_fair_queue_traffic_policing_max_rate,        QDISC_KIND_FQ,                 0
-FairQueueing.Buckets,                        config_parse_fair_queue_traffic_policing_u32,             QDISC_KIND_FQ,                 0
-FairQueueing.OrphanMask,                     config_parse_fair_queue_traffic_policing_u32,             QDISC_KIND_FQ,                 0
-FairQueueing.Pacing,                         config_parse_fair_queue_traffic_policing_bool,            QDISC_KIND_FQ,                 0
-FairQueueing.CEThresholdSec,                 config_parse_fair_queue_traffic_policing_usec,            QDISC_KIND_FQ,                 0
+FairQueueing.PacketLimit,                    config_parse_fair_queueing_u32,             QDISC_KIND_FQ,                 0
+FairQueueing.FlowLimit,                      config_parse_fair_queueing_u32,             QDISC_KIND_FQ,                 0
+FairQueueing.Quantum,                        config_parse_fair_queueing_size,            QDISC_KIND_FQ,                 0
+FairQueueing.InitialQuantum,                 config_parse_fair_queueing_size,            QDISC_KIND_FQ,                 0
+FairQueueing.MaximumRate,                    config_parse_fair_queueing_max_rate,        QDISC_KIND_FQ,                 0
+FairQueueing.Buckets,                        config_parse_fair_queueing_u32,             QDISC_KIND_FQ,                 0
+FairQueueing.OrphanMask,                     config_parse_fair_queueing_u32,             QDISC_KIND_FQ,                 0
+FairQueueing.Pacing,                         config_parse_fair_queueing_bool,            QDISC_KIND_FQ,                 0
+FairQueueing.CEThresholdSec,                 config_parse_fair_queueing_usec,            QDISC_KIND_FQ,                 0
 FairQueueingControlledDelay.Parent,          config_parse_qdisc_parent,                                QDISC_KIND_FQ_CODEL,           0
 FairQueueingControlledDelay.PacketLimit,     config_parse_fair_queueing_controlled_delay_u32,          QDISC_KIND_FQ_CODEL,           0
 FairQueueingControlledDelay.MemoryLimit,     config_parse_fair_queueing_controlled_delay_size,         QDISC_KIND_FQ_CODEL,           0

diff --git a/src/network/tc/fq.c b/src/network/tc/fq.c
index 28ee64fa69ddd5d81322cad00916aba332539882..c7eeec230737c9721e8e386b3014b86ea6a0ab87 100644 (file)
--- a/src/network/tc/fq.c
+++ b/src/network/tc/fq.c
@@ -11,7 +11,7 @@
 #include "string-util.h"
 #include "util.h"
 
-static int fair_queue_traffic_policing_init(QDisc *qdisc) {
+static int fair_queueing_init(QDisc *qdisc) {
         FairQueueing *fq;
 
         assert(qdisc);
@@ -24,7 +24,7 @@ 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) {
+static int fair_queueing_fill_message(Link *link, QDisc *qdisc, sd_netlink_message *req) {
         FairQueueing *fq;
         int r;
 
@@ -102,7 +102,7 @@ static int fair_queue_traffic_policing_fill_message(Link *link, QDisc *qdisc, sd
         return 0;
 }
 
-int config_parse_fair_queue_traffic_policing_u32(
+int config_parse_fair_queueing_u32(
                 const char *unit,
                 const char *filename,
                 unsigned line,
@@ -165,7 +165,7 @@ int config_parse_fair_queue_traffic_policing_u32(
         return 0;
 }
 
-int config_parse_fair_queue_traffic_policing_size(
+int config_parse_fair_queueing_size(
                 const char *unit,
                 const char *filename,
                 unsigned line,
@@ -232,7 +232,7 @@ int config_parse_fair_queue_traffic_policing_size(
         return 0;
 }
 
-int config_parse_fair_queue_traffic_policing_bool(
+int config_parse_fair_queueing_bool(
                 const char *unit,
                 const char *filename,
                 unsigned line,
@@ -284,7 +284,7 @@ int config_parse_fair_queue_traffic_policing_bool(
         return 0;
 }
 
-int config_parse_fair_queue_traffic_policing_usec(
+int config_parse_fair_queueing_usec(
                 const char *unit,
                 const char *filename,
                 unsigned line,
@@ -343,7 +343,7 @@ int config_parse_fair_queue_traffic_policing_usec(
         return 0;
 }
 
-int config_parse_fair_queue_traffic_policing_max_rate(
+int config_parse_fair_queueing_max_rate(
                 const char *unit,
                 const char *filename,
                 unsigned line,
@@ -403,8 +403,8 @@ int config_parse_fair_queue_traffic_policing_max_rate(
 }
 
 const QDiscVTable fq_vtable = {
-        .init = fair_queue_traffic_policing_init,
+        .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,
 };

diff --git a/src/network/tc/fq.h b/src/network/tc/fq.h
index 0e8ced03d0fac32926fa5da54e2c5c12d683c8f8..5a8ed6d651223e446fedaa080a570c816204cac5 100644 (file)
--- a/src/network/tc/fq.h
+++ b/src/network/tc/fq.h
@@ -22,8 +22,8 @@ typedef struct FairQueueing {
 DEFINE_QDISC_CAST(FQ, FairQueueing);
 extern const QDiscVTable fq_vtable;
 
-CONFIG_PARSER_PROTOTYPE(config_parse_fair_queue_traffic_policing_u32);
-CONFIG_PARSER_PROTOTYPE(config_parse_fair_queue_traffic_policing_size);
-CONFIG_PARSER_PROTOTYPE(config_parse_fair_queue_traffic_policing_bool);
-CONFIG_PARSER_PROTOTYPE(config_parse_fair_queue_traffic_policing_usec);
-CONFIG_PARSER_PROTOTYPE(config_parse_fair_queue_traffic_policing_max_rate);
+CONFIG_PARSER_PROTOTYPE(config_parse_fair_queueing_u32);
+CONFIG_PARSER_PROTOTYPE(config_parse_fair_queueing_size);
+CONFIG_PARSER_PROTOTYPE(config_parse_fair_queueing_bool);
+CONFIG_PARSER_PROTOTYPE(config_parse_fair_queueing_usec);
+CONFIG_PARSER_PROTOTYPE(config_parse_fair_queueing_max_rate);