From: Toke Høiland-Jørgensen <toke@toke.dk>
Date: Fri, 14 Sep 2018 13:51:39 +0000 (+0200)
Subject: q_cake: Also print nonat, nowash and no-ack-filter keywords
X-Git-Tag: v4.19.0~38
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2153e01f361ca57dc1baf3cdff1f4ec4323abf38;p=thirdparty%2Fiproute2.git

q_cake: Also print nonat, nowash and no-ack-filter keywords

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 <toke@toke.dk>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---

diff --git a/tc/q_cake.c b/tc/q_cake.c
index 077bf84f6..e827e3f11 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);