diff options
| author | Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> | 2018-09-14 21:52:39 +0100 |
|---|---|---|
| committer | Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> | 2018-09-15 08:49:36 +0100 |
| commit | 4f6ad3c13ace1d341179ad82f417aa0ce5adf51d (patch) | |
| tree | 4bb0b800b9d39d94f698d43b2067f45bcbe6fbe9 /package/network/utils/iproute2/patches | |
| parent | e60be1133036b5ccce94d73d21e159840143fd41 (diff) | |
| download | upstream-4f6ad3c13ace1d341179ad82f417aa0ce5adf51d.tar.gz upstream-4f6ad3c13ace1d341179ad82f417aa0ce5adf51d.tar.bz2 upstream-4f6ad3c13ace1d341179ad82f417aa0ce5adf51d.zip | |
iproute2: q_cake: Also print nonat, nowash and no-ack-filter keywords
Pull in latest upstream tweaks:
Similar to the previous patch for no-split-gso, the negative keywords for
'nat', 'wash' and 'ack-filter' were not printed either. Add those as well.
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
(cherry picked from commit 033f02b9b5580e67e2f1b623f62da60d645e7ba2)
Diffstat (limited to 'package/network/utils/iproute2/patches')
| -rw-r--r-- | package/network/utils/iproute2/patches/950-add-cake-to-tc.patch | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/package/network/utils/iproute2/patches/950-add-cake-to-tc.patch b/package/network/utils/iproute2/patches/950-add-cake-to-tc.patch index 038ca23337..1eebb729c3 100644 --- a/package/network/utils/iproute2/patches/950-add-cake-to-tc.patch +++ b/package/network/utils/iproute2/patches/950-add-cake-to-tc.patch @@ -854,7 +854,7 @@ TCMODULES += e_bpf.o --- /dev/null +++ b/tc/q_cake.c -@@ -0,0 +1,801 @@ +@@ -0,0 +1,805 @@ +// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause + +/* @@ -1325,6 +1325,8 @@ + + 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] && @@ -1365,6 +1367,8 @@ + + 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) @@ -1377,7 +1381,7 @@ + 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); |