]> git.ipfire.org Git - thirdparty/iproute2.git/commitdiff
q_cake: Also print nonat, nowash and no-ack-filter keywords
authorToke Høiland-Jørgensen <toke@toke.dk>
Fri, 14 Sep 2018 13:51:39 +0000 (15:51 +0200)
committerStephen Hemminger <stephen@networkplumber.org>
Fri, 14 Sep 2018 18:32:46 +0000 (11:32 -0700)
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>
tc/q_cake.c

index 077bf84f62a2129e6ca76da8cdb945ba388f03d5..e827e3f11d058a8aed60a254230f7daf23e7c072 100644 (file)
@@ -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);