From patchwork Thu Jul 19 16:55:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= X-Patchwork-Id: 946513 X-Patchwork-Delegate: dsahern@gmail.com Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=toke.dk Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=toke.dk header.i=@toke.dk header.b="aeloK2JX"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41WgBX2d33z9s4s for ; Fri, 20 Jul 2018 02:55:48 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731751AbeGSRjs (ORCPT ); Thu, 19 Jul 2018 13:39:48 -0400 Received: from mail.toke.dk ([52.28.52.200]:50363 "EHLO mail.toke.dk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731663AbeGSRjs (ORCPT ); Thu, 19 Jul 2018 13:39:48 -0400 From: =?utf-8?q?Toke_H=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_H?= =?utf-8?b?w7hpbGFuZC1Kw7hyZ2Vuc2Vu?= Subject: [PATCH iproute2-next] q_cake: Rename autorate_ingress parameter to use dash as word separator Date: Thu, 19 Jul 2018 18:55:29 +0200 Message-Id: <20180719165529.6976-1-toke@toke.dk> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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");