From patchwork Fri Sep 14 13:51:39 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: 969885 X-Patchwork-Delegate: shemminger@vyatta.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="cIQgaUIB"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42BcQ16KFQz9s4V for ; Fri, 14 Sep 2018 23:51:53 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727992AbeINTG2 (ORCPT ); Fri, 14 Sep 2018 15:06:28 -0400 Received: from mail.toke.dk ([52.28.52.200]:58751 "EHLO mail.toke.dk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727746AbeINTG1 (ORCPT ); Fri, 14 Sep 2018 15:06:27 -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=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_H=C3=B8iland-J=C3=B8rgensen?= Subject: [PATCH iproute2] q_cake: Also print nonat, nowash and no-ack-filter keywords Date: Fri, 14 Sep 2018 15:51:39 +0200 Message-Id: <20180914135139.16369-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 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);