From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.toke.dk (mail.toke.dk [IPv6:2001:470:dc45:1000::1]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.bufferbloat.net (Postfix) with ESMTPS id 169123CB35 for ; Thu, 19 Jul 2018 12:55:46 -0400 (EDT) From: =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=toke.dk; s=20161023; t=1532019345; bh=pU581TB6e8cZFBVDHkgteeq5JJHWBRF4c9mXV4KvFC0=; h=From:To:Cc:Subject:Date:From; b=aeloK2JXsclhbb/L2+YkhVXzzaCVO1QWl+aetxfSMyLnP4jLTNY4zVDZJ2h2YU/Ah sYknyvzZLLqgrp15yH+VuGDnF/dqpUM2rvWOdX35yvo6dpixDPBe5F6v10pJf1dNGK qw3EAzM+7PfafNdDgmm7f866nR9pvcoG03ONCOxyrsohsBGjkZ98xDgbjLeYEkla7n Ph8aO6PZKnd/jKBf+PpAIE4SmEKZqOvFDMYmifdzxYYuugNH6HqsdHSpKmlwiYyW5p 6AljR/yQKGGDCaw/fAgUEuhpW952yiZ+k54Rso5L0WfhoZ6g3ssMtrrGy3q9n84fNd dorrdUsv24BOg== To: dsahern@gmail.com Cc: netdev@vger.kernel.org, cake@lists.bufferbloat.net, =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= Date: Thu, 19 Jul 2018 18:55:29 +0200 Message-Id: <20180719165529.6976-1-toke@toke.dk> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Cake] [PATCH iproute2-next] q_cake: Rename autorate_ingress parameter to use dash as word separator X-BeenThere: cake@lists.bufferbloat.net X-Mailman-Version: 2.1.20 Precedence: list List-Id: Cake - FQ_codel the next generation List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Jul 2018 16:55:46 -0000 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 --- man/man8/tc-cake.8 | 4 ++-- tc/q_cake.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/man/man8/tc-cake.8 b/man/man8/tc-cake.8 index 0ffef094..0e84bc6e 100644 --- a/man/man8/tc-cake.8 +++ b/man/man8/tc-cake.8 @@ -9,7 +9,7 @@ CAKE \- Common Applications Kept Enhanced (CAKE) RATE | .BR unlimited* | -.BR autorate_ingress +.BR autorate-ingress ] .br [ @@ -149,7 +149,7 @@ RATE .BR tc(8) or examples below for details of the RATE value. .PP -.B autorate_ingress +.B autorate-ingress .br Automatic capacity estimation based on traffic arriving at this qdisc. This is most likely to be useful with cellular links, which tend to change diff --git a/tc/q_cake.c b/tc/q_cake.c index b5476584..f1e232a6 100644 --- a/tc/q_cake.c +++ b/tc/q_cake.c @@ -71,7 +71,7 @@ static struct cake_preset *find_preset(char *argv) static void explain(void) { 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" " internet* | oceanic | satellite | interplanetary ]\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; unlimited = 1; autorate = 0; - } else if (strcmp(*argv, "autorate_ingress") == 0) { + } else if (strcmp(*argv, "autorate-ingress") == 0) { autorate = 1; } else if (strcmp(*argv, "rtt") == 0) { 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)) { autorate = rta_getattr_u32(tb[TCA_CAKE_AUTORATE]); if (autorate == 1) - print_string(PRINT_ANY, "autorate", "autorate_%s ", - "ingress"); + print_string(PRINT_ANY, "autorate", "%s ", + "autorate-ingress"); else if (autorate) print_string(PRINT_ANY, "autorate", "(?autorate?) ", "unknown"); -- 2.18.0