From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Mon, 25 Nov 2019 14:07:58 +0000 (+0900)
Subject: network: rename QDiscs to QDisc
X-Git-Tag: v245-rc1~309^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=edc54f2f753b929d78258eb26b3f95b5bb3137c9;p=thirdparty%2Fsystemd.git

network: rename QDiscs to QDisc
---

diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index 36d24fd0f3d..990f62850a3 100644
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -2585,7 +2585,7 @@ static int link_drop_config(Link *link) {
 }
 
 static int link_configure_qdiscs(Link *link) {
-        QDiscs *qdisc;
+        QDisc *qdisc;
         Iterator i;
         int r;
 
@@ -2601,7 +2601,7 @@ static int link_configure_qdiscs(Link *link) {
         if (link->qdisc_messages == 0)
                 link->qdiscs_configured = true;
         else
-                log_link_debug(link, "Configuring QDiscs");
+                log_link_debug(link, "Configuring queuing discipline (qdisc)");
 
         return 0;
 }
diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c
index 6bf979e9225..181afbb4cd1 100644
--- a/src/network/networkd-network.c
+++ b/src/network/networkd-network.c
@@ -154,7 +154,7 @@ int network_verify(Network *network) {
         Prefix *prefix, *prefix_next;
         Route *route, *route_next;
         FdbEntry *fdb, *fdb_next;
-        QDiscs *qdisc;
+        QDisc *qdisc;
         Iterator i;
 
         assert(network);
diff --git a/src/network/tc/netem.c b/src/network/tc/netem.c
index 053af3e7dbb..ea44fd1a9c2 100644
--- a/src/network/tc/netem.c
+++ b/src/network/tc/netem.c
@@ -34,7 +34,7 @@ int network_emulator_new(NetworkEmulator **ret) {
         return 0;
 }
 
-int network_emulator_fill_message(Link *link, QDiscs *qdisc, sd_netlink_message *req) {
+int network_emulator_fill_message(Link *link, QDisc *qdisc, sd_netlink_message *req) {
         struct tc_netem_qopt opt = {
                .limit = 1000,
         };
@@ -84,7 +84,7 @@ int config_parse_tc_network_emulator_delay(
                 void *data,
                 void *userdata) {
 
-        _cleanup_(qdisc_free_or_set_invalidp) QDiscs *qdisc = NULL;
+        _cleanup_(qdisc_free_or_set_invalidp) QDisc *qdisc = NULL;
         Network *network = data;
         usec_t u;
         int r;
@@ -139,7 +139,7 @@ int config_parse_tc_network_emulator_rate(
                 void *data,
                 void *userdata) {
 
-        _cleanup_(qdisc_free_or_set_invalidp) QDiscs *qdisc = NULL;
+        _cleanup_(qdisc_free_or_set_invalidp) QDisc *qdisc = NULL;
         Network *network = data;
         uint32_t rate;
         int r;
@@ -189,7 +189,7 @@ int config_parse_tc_network_emulator_packet_limit(
                 void *data,
                 void *userdata) {
 
-        _cleanup_(qdisc_free_or_set_invalidp) QDiscs *qdisc = NULL;
+        _cleanup_(qdisc_free_or_set_invalidp) QDisc *qdisc = NULL;
         Network *network = data;
         int r;
 
diff --git a/src/network/tc/netem.h b/src/network/tc/netem.h
index 43abf20af87..ac018f99604 100644
--- a/src/network/tc/netem.h
+++ b/src/network/tc/netem.h
@@ -8,7 +8,7 @@
 #include "networkd-link.h"
 #include "time-util.h"
 
-typedef struct QDiscs QDiscs;
+typedef struct QDisc QDisc;
 
 typedef struct NetworkEmulator {
         usec_t delay;
@@ -20,7 +20,7 @@ typedef struct NetworkEmulator {
 } NetworkEmulator;
 
 int network_emulator_new(NetworkEmulator **ret);
-int network_emulator_fill_message(Link *link, QDiscs *qdisc, sd_netlink_message *req);
+int network_emulator_fill_message(Link *link, QDisc *qdisc, sd_netlink_message *req);
 
 CONFIG_PARSER_PROTOTYPE(config_parse_tc_network_emulator_delay);
 CONFIG_PARSER_PROTOTYPE(config_parse_tc_network_emulator_rate);
diff --git a/src/network/tc/qdisc.c b/src/network/tc/qdisc.c
index 9b966f3d371..5a130d97793 100644
--- a/src/network/tc/qdisc.c
+++ b/src/network/tc/qdisc.c
@@ -14,14 +14,14 @@
 #include "string-util.h"
 #include "util.h"
 
-static int qdisc_new(QDiscs **ret) {
-        QDiscs *qdisc;
+static int qdisc_new(QDisc **ret) {
+        QDisc *qdisc;
 
-        qdisc = new(QDiscs, 1);
+        qdisc = new(QDisc, 1);
         if (!qdisc)
                 return -ENOMEM;
 
-        *qdisc = (QDiscs) {
+        *qdisc = (QDisc) {
                 .family = AF_UNSPEC,
                 .parent = TC_H_ROOT,
         };
@@ -31,9 +31,9 @@ static int qdisc_new(QDiscs **ret) {
         return 0;
 }
 
-int qdisc_new_static(Network *network, const char *filename, unsigned section_line, QDiscs **ret) {
+int qdisc_new_static(Network *network, const char *filename, unsigned section_line, QDisc **ret) {
         _cleanup_(network_config_section_freep) NetworkConfigSection *n = NULL;
-        _cleanup_(qdisc_freep) QDiscs *qdisc = NULL;
+        _cleanup_(qdisc_freep) QDisc *qdisc = NULL;
         int r;
 
         assert(network);
@@ -76,7 +76,7 @@ int qdisc_new_static(Network *network, const char *filename, unsigned section_li
         return 0;
 }
 
-void qdisc_free(QDiscs *qdisc) {
+void qdisc_free(QDisc *qdisc) {
         if (!qdisc)
                 return;
 
@@ -106,7 +106,7 @@ static int qdisc_handler(sd_netlink *rtnl, sd_netlink_message *m, Link *link) {
         }
 
         if (link->route_messages == 0) {
-                log_link_debug(link, "QDiscs configured");
+                log_link_debug(link, "QDisc configured");
                 link->qdiscs_configured = true;
                 link_check_ready(link);
         }
@@ -114,7 +114,7 @@ static int qdisc_handler(sd_netlink *rtnl, sd_netlink_message *m, Link *link) {
         return 1;
 }
 
-int qdisc_configure(Link *link, QDiscs *qdisc) {
+int qdisc_configure(Link *link, QDisc *qdisc) {
         _cleanup_(sd_netlink_message_unrefp) sd_netlink_message *req = NULL;
         _cleanup_free_ char *tca_kind = NULL;
         int r;
@@ -178,7 +178,7 @@ int qdisc_configure(Link *link, QDiscs *qdisc) {
         return 0;
 }
 
-int qdisc_section_verify(QDiscs *qdisc, bool *has_root, bool *has_clsact) {
+int qdisc_section_verify(QDisc *qdisc, bool *has_root, bool *has_clsact) {
         assert(qdisc);
         assert(has_root);
         assert(has_clsact);
@@ -223,7 +223,7 @@ int config_parse_tc_qdiscs_parent(
                 void *data,
                 void *userdata) {
 
-        _cleanup_(qdisc_free_or_set_invalidp) QDiscs *qdisc = NULL;
+        _cleanup_(qdisc_free_or_set_invalidp) QDisc *qdisc = NULL;
         Network *network = data;
         int r;
 
diff --git a/src/network/tc/qdisc.h b/src/network/tc/qdisc.h
index f108c603015..4810b876006 100644
--- a/src/network/tc/qdisc.h
+++ b/src/network/tc/qdisc.h
@@ -9,7 +9,7 @@
 #include "networkd-util.h"
 #include "tbf.h"
 
-typedef struct QDiscs {
+typedef struct QDisc {
         NetworkConfigSection *section;
         Network *network;
 
@@ -25,15 +25,15 @@ typedef struct QDiscs {
 
         NetworkEmulator ne;
         TokenBufferFilter tbf;
-} QDiscs;
+} QDisc;
 
-void qdisc_free(QDiscs *qdisc);
-int qdisc_new_static(Network *network, const char *filename, unsigned section_line, QDiscs **ret);
+void qdisc_free(QDisc *qdisc);
+int qdisc_new_static(Network *network, const char *filename, unsigned section_line, QDisc **ret);
 
-int qdisc_configure(Link *link, QDiscs *qdisc);
+int qdisc_configure(Link *link, QDisc *qdisc);
 
-int qdisc_section_verify(QDiscs *qdisc, bool *has_root, bool *has_clsact);
+int qdisc_section_verify(QDisc *qdisc, bool *has_root, bool *has_clsact);
 
-DEFINE_NETWORK_SECTION_FUNCTIONS(QDiscs, qdisc_free);
+DEFINE_NETWORK_SECTION_FUNCTIONS(QDisc, qdisc_free);
 
 CONFIG_PARSER_PROTOTYPE(config_parse_tc_qdiscs_parent);
diff --git a/src/network/tc/tbf.c b/src/network/tc/tbf.c
index 47c999e7c7c..a4ef9ab2992 100644
--- a/src/network/tc/tbf.c
+++ b/src/network/tc/tbf.c
@@ -74,7 +74,7 @@ int config_parse_tc_token_buffer_filter_size(
                 void *data,
                 void *userdata) {
 
-        _cleanup_(qdisc_free_or_set_invalidp) QDiscs *qdisc = NULL;
+        _cleanup_(qdisc_free_or_set_invalidp) QDisc *qdisc = NULL;
         Network *network = data;
         uint64_t k;
         int r;
@@ -129,7 +129,7 @@ int config_parse_tc_token_buffer_filter_latency(
                 void *data,
                 void *userdata) {
 
-        _cleanup_(qdisc_free_or_set_invalidp) QDiscs *qdisc = NULL;
+        _cleanup_(qdisc_free_or_set_invalidp) QDisc *qdisc = NULL;
         Network *network = data;
         usec_t u;
         int r;