Re: [Cake] [PATCH iproute2] q_cake: Also print nonat, nowash and no-ack-filter keywords

2018-09-14 Thread Stephen Hemminger
On Fri, 14 Sep 2018 15:51:39 +0200
Toke Høiland-Jørgensen  wrote:

> 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 

Applied, thanks.
___
Cake mailing list
Cake@lists.bufferbloat.net
https://lists.bufferbloat.net/listinfo/cake


[Cake] [PATCH iproute2] q_cake: Also print nonat, nowash and no-ack-filter keywords

2018-09-14 Thread Toke Høiland-Jørgensen
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

___
Cake mailing list
Cake@lists.bufferbloat.net
https://lists.bufferbloat.net/listinfo/cake