matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

q_cake: Rename autorate_ingress parameter to use dash as word separator 

This is consistent with the other multi-word parameters. Also change the
JSON output to be consistent with way it is formatted for the other
options.

Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>
Signed-off-by: David Ahern <dsahern@gmail.com>
This commit is contained in:
Toke Høiland-Jørgensen 2018-07-19 18:55:29 +02:00 committed by David Ahern
parent 714444c0cb
commit 77c9fbd06e
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
man/man8/tc-cake.8
View File

@ -9,7 +9,7 @@ CAKE \- Common Applications Kept Enhanced (CAKE)
RATE | RATE |
.BR unlimited* .BR unlimited*
| |
.BR autorate_ingress .BR autorate-ingress
] ]
.br .br
[ [
@ -149,7 +149,7 @@ RATE
.BR tc(8) .BR tc(8)
or examples below for details of the RATE value. or examples below for details of the RATE value.
.PP .PP
.B autorate_ingress .B autorate-ingress
.br .br
Automatic capacity estimation based on traffic arriving at this qdisc. Automatic capacity estimation based on traffic arriving at this qdisc.
This is most likely to be useful with cellular links, which tend to change This is most likely to be useful with cellular links, which tend to change

8
tc/q_cake.c
View File

@ -71,7 +71,7 @@ static struct cake_preset *find_preset(char *argv)
static void explain(void) static void explain(void)
{ {
fprintf(stderr, fprintf(stderr,
"Usage: ... cake [ bandwidth RATE | unlimited* | autorate_ingress ]\n" "Usage: ... cake [ bandwidth RATE | unlimited* | autorate-ingress ]\n"
" [ rtt TIME | datacentre | lan | metro | regional |\n" " [ rtt TIME | datacentre | lan | metro | regional |\n"
" internet* | oceanic | satellite | interplanetary ]\n" " internet* | oceanic | satellite | interplanetary ]\n"
" [ besteffort | diffserv8 | diffserv4 | diffserv3* ]\n" " [ besteffort | diffserv8 | diffserv4 | diffserv3* ]\n"
@ -122,7 +122,7 @@ static int cake_parse_opt(struct qdisc_util *qu, int argc, char **argv,
bandwidth = 0; bandwidth = 0;
unlimited = 1; unlimited = 1;
autorate = 0; autorate = 0;
} else if (strcmp(*argv, "autorate_ingress") == 0) { } else if (strcmp(*argv, "autorate-ingress") == 0) {
autorate = 1; autorate = 1;
} else if (strcmp(*argv, "rtt") == 0) { } else if (strcmp(*argv, "rtt") == 0) {
NEXT_ARG(); NEXT_ARG();
@ -435,8 +435,8 @@ static int cake_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt)
RTA_PAYLOAD(tb[TCA_CAKE_AUTORATE]) >= sizeof(__u32)) { RTA_PAYLOAD(tb[TCA_CAKE_AUTORATE]) >= sizeof(__u32)) {
autorate = rta_getattr_u32(tb[TCA_CAKE_AUTORATE]); autorate = rta_getattr_u32(tb[TCA_CAKE_AUTORATE]);
if (autorate == 1) if (autorate == 1)
print_string(PRINT_ANY, "autorate", "autorate_%s ", print_string(PRINT_ANY, "autorate", "%s ",
"ingress"); "autorate-ingress");
else if (autorate) else if (autorate)
print_string(PRINT_ANY, "autorate", "(?autorate?) ", print_string(PRINT_ANY, "autorate", "(?autorate?) ",
"unknown"); "unknown");