From ff60129bc4182a4a5ce7b2ff7b7ff67f6d945241 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Thu, 12 Mar 2020 18:18:18 +0900 Subject: [PATCH 1/2] network: rename type name to ProportionalIntegralControllerEnhanced --- src/network/tc/pie.c | 6 +++--- src/network/tc/pie.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/network/tc/pie.c b/src/network/tc/pie.c index e92ced1343..a0d21de8ba 100644 --- a/src/network/tc/pie.c +++ b/src/network/tc/pie.c @@ -11,7 +11,7 @@ #include "string-util.h" static int pie_fill_message(Link *link, QDisc *qdisc, sd_netlink_message *req) { - proportional_integral_controller_enhanced *pie; + ProportionalIntegralControllerEnhanced *pie; int r; assert(link); @@ -50,7 +50,7 @@ int config_parse_pie_packet_limit( void *userdata) { _cleanup_(qdisc_free_or_set_invalidp) QDisc *qdisc = NULL; - proportional_integral_controller_enhanced *pie; + ProportionalIntegralControllerEnhanced *pie; Network *network = data; int r; @@ -89,7 +89,7 @@ int config_parse_pie_packet_limit( } const QDiscVTable pie_vtable = { - .object_size = sizeof(proportional_integral_controller_enhanced), + .object_size = sizeof(ProportionalIntegralControllerEnhanced), .tca_kind = "pie", .fill_message = pie_fill_message, }; diff --git a/src/network/tc/pie.h b/src/network/tc/pie.h index 44214f1ba1..7c764742ad 100644 --- a/src/network/tc/pie.h +++ b/src/network/tc/pie.h @@ -5,13 +5,13 @@ #include "conf-parser.h" #include "qdisc.h" -typedef struct proportional_integral_controller_enhanced { +typedef struct ProportionalIntegralControllerEnhanced { QDisc meta; uint32_t packet_limit; -} proportional_integral_controller_enhanced; +} ProportionalIntegralControllerEnhanced; -DEFINE_QDISC_CAST(PIE, proportional_integral_controller_enhanced); +DEFINE_QDISC_CAST(PIE, ProportionalIntegralControllerEnhanced); extern const QDiscVTable pie_vtable; CONFIG_PARSER_PROTOTYPE(config_parse_pie_packet_limit); From f344a492d15831eb4feaf7c8b990f04e277449b7 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Thu, 12 Mar 2020 18:33:15 +0900 Subject: [PATCH 2/2] man: use include directive for Parent= or friends --- man/systemd.network.xml | 368 +++++----------------------------------- man/tc.xml | 46 +++++ 2 files changed, 88 insertions(+), 326 deletions(-) create mode 100644 man/tc.xml diff --git a/man/systemd.network.xml b/man/systemd.network.xml index f1625dfde4..a174a1fb24 100644 --- a/man/systemd.network.xml +++ b/man/systemd.network.xml @@ -2333,13 +2333,7 @@ - - Handle= - - Specifies the major number of unique identifier of the qdisc, known as the handle. - Takes a number in hexadecimal ranges 1 to ffff. Defaults to unset. - - + @@ -2351,23 +2345,8 @@ simulate internet connections. - - Parent= - - Specifies the parent Queueing Discipline (qdisc). Takes one of root, - clsact, ingress or a class id. The class id takes the - major and minor number in hexadecimal ranges 1 to ffff separated with a colon - (major:minor). Defaults to root. - - - - - Handle= - - Specifies the major number of unique identifier of the qdisc, known as the handle. - Takes a number in hexadecimal ranges 1 to ffff. Defaults to unset. - - + + DelaySec= @@ -2417,23 +2396,8 @@ token bucket filter (tbf). - - Parent= - - Specifies the parent Queueing Discipline (qdisc). Takes one of root, - clsact, ingress or a class id. The class id takes the - major and minor number in hexadecimal ranges 1 to ffff separated with a colon - (major:minor). Defaults to root. - - - - - Handle= - - Specifies the major number of unique identifier of the qdisc, known as the handle. - Takes a number in hexadecimal ranges 1 to ffff. Defaults to unset. - - + + LatencySec= @@ -2506,21 +2470,8 @@ (qdisc) of Proportional Integral controller-Enhanced (PIE). - - Parent= - - Specifies the parent Queueing Discipline (qdisc). Takes one of root, - clsact or ingress. Defaults to root. - - - - - Handle= - - Specifies the major number of unique identifier of the qdisc, known as the handle. - Takes a number in hexadecimal ranges 1 to ffff. Defaults to unset. - - + + PacketLimit= @@ -2538,21 +2489,8 @@ (qdisc) of stochastic fair blue (sfb). - - Parent= - - Specifies the parent Queueing Discipline (qdisc). Takes one of root, - clsact or ingress. Defaults to root. - - - - - Handle= - - Specifies the major number of unique identifier of the qdisc, known as the handle. - Takes a number in hexadecimal ranges 1 to ffff. Defaults to unset. - - + + PacketLimit= @@ -2570,23 +2508,8 @@ (qdisc) of stochastic fairness queueing (sfq). - - Parent= - - Specifies the parent Queueing Discipline (qdisc). Takes one of root, - clsact, ingress or a class id. The class id takes the - major and minor number in hexadecimal ranges 1 to ffff separated with a colon - (major:minor). Defaults to root. - - - - - Handle= - - Specifies the major number of unique identifier of the qdisc, known as the handle. - Takes a number in hexadecimal ranges 1 to ffff. Defaults to unset. - - + + PerturbPeriodSec= @@ -2603,21 +2526,8 @@ Byte limited Packet First In First Out (bfifo). - - Parent= - - Specifies the parent Queueing Discipline (qdisc). Takes one of root, - clsact or ingress. Defaults to root. - - - - - Handle= - - Specifies the major number of unique identifier of the qdisc, known as the handle. - Takes a number in hexadecimal ranges 1 to ffff. Defaults to unset. - - + + LimitSize= @@ -2637,21 +2547,8 @@ Packet First In First Out (pfifo). - - Parent= - - Specifies the parent Queueing Discipline (qdisc). Takes one of root, - clsact or ingress. Defaults to root. - - - - - Handle= - - Specifies the major number of unique identifier of the qdisc, known as the handle. - Takes a number in hexadecimal ranges 1 to ffff. Defaults to unset. - - + + PacketLimit= @@ -2670,18 +2567,8 @@ Packet First In First Out Head Drop (pfifo_head_drop). - - Parent= - - As in [PFIFO] section. - - - - Handle= - - As in [PFIFO] section.. - - + + PacketLimit= @@ -2697,18 +2584,8 @@ Packet First In First Out Fast (pfifo_fast). - - Parent= - - As in [PFIFO] section. - - - - Handle= - - As in [PFIFO] section.. - - + + @@ -2718,31 +2595,16 @@ Common Applications Kept Enhanced (CAKE). - - Parent= - - Specifies the parent Queueing Discipline (qdisc). Takes one of root, - clsact, ingress or a class id. The class id takes the - major and minor number in hexadecimal ranges 1 to ffff separated with a colon - (major:minor). Defaults to root. - - + + - Handle= - - Specifies the major number of unique identifier of the qdisc, known as the handle. - Takes a number in hexadecimal ranges 1 to ffff. Defaults to unset. - - - - Overhead= Specifies that bytes to be addeded to the size of each packet. Bytes may be negative. Takes an integer ranges -64 to 256. Defaults to unset and kernel's default is used. - + Bandwidth= @@ -2761,23 +2623,8 @@ controlled delay (CoDel). - - Parent= - - Specifies the parent Queueing Discipline (qdisc). Takes one of root, - clsact, ingress or a class id. The class id takes the - major and minor number in hexadecimal ranges 1 to ffff separated with a colon - (major:minor). Defaults to root. - - - - - Handle= - - Specifies the major number of unique identifier of the qdisc, known as the handle. - Takes a number in hexadecimal ranges 1 to ffff. Defaults to unset. - - + + PacketLimit= @@ -2827,23 +2674,8 @@ Deficit Round Robin Scheduler (DRR). - - Parent= - - Specifies the parent Queueing Discipline (qdisc). Takes one of root, - clsact, ingress or a class id. The class id takes the - major and minor number in hexadecimal ranges 1 to ffff separated with a colon - (major:minor). Defaults to root. - - - - - Handle= - - Specifies the major number of unique identifier of the qdisc, known as the handle. - Takes a number in hexadecimal ranges 1 to ffff. Defaults to unset. - - + + @@ -2853,23 +2685,8 @@ Deficit Round Robin Scheduler (DRR). - - Parent= - - Specifies the parent Queueing Discipline (qdisc). Takes one of root, - clsact, ingress or a class id. The class id takes the - major and minor number in hexadecimal ranges 1 to ffff separated with a colon - (major:minor). Defaults to root. - - - - - ClassId= - - Specifies the major and minur number of unique identifier of the class, known as the - class ID. Each number is in hexadecimal ranges 1 to ffff. Defaults to unset. - - + + Quantum= @@ -2889,21 +2706,8 @@ (qdisc) of Generic Random Early Detection (GRED). - - Parent= - - Specifies the parent Queueing Discipline (qdisc). Takes one of root, - clsact or ingress. Defaults to root. - - - - - Handle= - - Specifies the major number of unique identifier of the qdisc, known as the handle. - Takes a number in hexadecimal ranges 1 to ffff. Defaults to unset. - - + + VirtualQueues= @@ -2936,23 +2740,8 @@ (qdisc) of fair queuing controlled delay (FQ-CoDel). - - Parent= - - Specifies the parent Queueing Discipline (qdisc). Takes one of root, - clsact, ingress or a class id. The class id takes the - major and minor number in hexadecimal ranges 1 to ffff separated with a colon - (major:minor). Defaults to root. - - - - - Handle= - - Specifies the major number of unique identifier of the qdisc, known as the handle. - Takes a number in hexadecimal ranges 1 to ffff. Defaults to unset. - - + + PacketLimit= @@ -3028,23 +2817,8 @@ (qdisc) of fair queue traffic policing (FQ). - - Parent= - - Specifies the parent Queueing Discipline (qdisc). Takes one of root, - clsact, ingress or a class id. The class id takes the - major and minor number in hexadecimal ranges 1 to ffff separated with a colon - (major:minor). Defaults to root. - - - - - Handle= - - Specifies the major number of unique identifier of the qdisc, known as the handle. - Takes a number in hexadecimal ranges 1 to ffff. Defaults to unset. - - + + PacketLimit= @@ -3132,23 +2906,8 @@ trivial link equalizer (teql). - - Parent= - - Specifies the parent Queueing Discipline (qdisc). Takes one of root, - clsact, ingress or a class id. The class id takes the - major and minor number in hexadecimal ranges 1 to ffff separated with a colon - (major:minor). Defaults to root. - - - - - Handle= - - Specifies the major number of unique identifier of the qdisc, known as the handle. - Takes a number in hexadecimal ranges 1 to ffff. Defaults to unset. - - + + Id= @@ -3168,23 +2927,8 @@ hierarchy token bucket (htb). - - Parent= - - Specifies the parent Queueing Discipline (qdisc). Takes one of root, - clsact, ingress or a class id. The class id takes the - major and minor number in hexadecimal ranges 1 to ffff separated with a colon - (major:minor). Defaults to root. - - - - - Handle= - - Specifies the major number of unique identifier of the qdisc, known as the handle. - Takes a number in hexadecimal ranges 1 to ffff. Defaults to unset. - - + + DefaultClass= @@ -3202,23 +2946,8 @@ hierarchy token bucket (htb). - - Parent= - - Specifies the parent Queueing Discipline (qdisc). Takes one of root, - or a qdisc id. The qdisc id takes the major and minor number in hexadecimal ranges 1 to ffff - separated with a colon (major:minor). Defaults to root. - - - - - - ClassId= - - Specifies the major and minur number of unique identifier of the class, known as the - class ID. Each number is in hexadecimal ranges 1 to ffff. Defaults to unset. - - + + Priority= @@ -3255,21 +2984,8 @@ (qdisc) of Heavy Hitter Filter (hhf). - - Parent= - - Specifies the parent Queueing Discipline (qdisc). Takes one of root, - clsact or ingress. Defaults to root. - - - - - Handle= - - Specifies the major number of unique identifier of the qdisc, known as the handle. - Takes a number in hexadecimal ranges 1 to ffff. Defaults to unset. - - + + PacketLimit= diff --git a/man/tc.xml b/man/tc.xml new file mode 100644 index 0000000000..1711915c22 --- /dev/null +++ b/man/tc.xml @@ -0,0 +1,46 @@ + + + + + + + + + Parent= + + Specifies the parent Queueing Discipline (qdisc). Takes one of root, + clsact, ingress or a class id. The class id takes the + major and minor number in hexadecimal ranges 1 to ffff separated with a colon + (major:minor). Defaults to root. + + + + + Handle= + + Specifies the major number of unique identifier of the qdisc, known as the handle. + Takes a number in hexadecimal ranges 1 to ffff. Defaults to unset. + + + + + Parent= + + Specifies the parent Queueing Discipline (qdisc). Takes one of root, + or a qdisc id. The qdisc id takes the major and minor number in hexadecimal ranges 1 to ffff + separated with a colon (major:minor). Defaults to root. + + + + + + ClassId= + + Specifies the major and minur number of unique identifier of the class, known as the + class ID. Each number is in hexadecimal ranges 1 to ffff. Defaults to unset. + + + +