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 13D8A3BA8E for ; Fri, 14 Sep 2018 09:51:48 -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=1536933106; bh=HotgxDCT4C2pP7Xhn6oCZbbjbOIhxgRf53zA/DN/Q0c=; h=From:To:Cc:Subject:Date:From; b=cIQgaUIB4ZKg0v8c8J2kqvEG+IujJbBLmsaAnRgBBHSLCnFPKgAziQ7+w14ERqIEH ytyvkd7aeqsL2M/N/zSUzUUdNvygDdV2rX1f0TU0y4n1taYJLaJqbLcPI3rfsgf0nd mMGXQnxmcNz7TYZy3dK8QaT1tX2PBzJnrWQNak8ab7oWrjkBqNxz1V98px4OLHOSGl R4oGahh+1Lx8JqShkdK52EjUziRvnb3KNDWrvAUK9oiovMy2IvQPay05cFD4XQweS2 3GOO8coVCxCymsgLMgZvhDn0/ccmcbGHR+RXFnVSwRHuhinTi+iursS329YdW9E3y2 5l+uODVqhEvQg== To: netdev@vger.kernel.org Cc: cake@lists.bufferbloat.net, =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= Date: Fri, 14 Sep 2018 15:51:39 +0200 Message-Id: <20180914135139.16369-1-toke@toke.dk> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Cake] [PATCH iproute2] q_cake: Also print nonat, nowash and no-ack-filter keywords 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: Fri, 14 Sep 2018 13:51:48 -0000 Similar to the previous patch for no-split-gso, the negative keywords for 'nat', 'wash' and 'ack-filter' were not printed either. Add those well. Signed-off-by: Toke Høiland-Jørgensen --- tc/q_cake.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tc/q_cake.c b/tc/q_cake.c index 077bf84f..e827e3f1 100644 --- a/tc/q_cake.c +++ b/tc/q_cake.c @@ -468,6 +468,8 @@ static int cake_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt) if (nat) print_string(PRINT_FP, NULL, "nat ", NULL); + else + print_string(PRINT_FP, NULL, "nonat ", NULL); print_bool(PRINT_JSON, "nat", NULL, nat); if (tb[TCA_CAKE_WASH] && @@ -508,6 +510,8 @@ static int cake_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt) if (wash) print_string(PRINT_FP, NULL, "wash ", NULL); + else + print_string(PRINT_FP, NULL, "nowash ", NULL); print_bool(PRINT_JSON, "wash", NULL, wash); if (ingress) @@ -520,7 +524,7 @@ static int cake_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt) else if (ack_filter == CAKE_ACK_FILTER) print_string(PRINT_ANY, "ack-filter", "ack-filter ", "enabled"); else - print_string(PRINT_JSON, "ack-filter", NULL, "disabled"); + print_string(PRINT_ANY, "ack-filter", "no-ack-filter ", "disabled"); if (split_gso) print_string(PRINT_FP, NULL, "split-gso ", NULL); -- 2.18.0