KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
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>
This commit is contained in:
Kevin Darbyshire-Bryant 2018-09-14 21:52:39 +01:00
parent 4a3298c124
commit 033f02b9b5
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package/network/utils/iproute2/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=iproute2 PKG_NAME:=iproute2
PKG_VERSION:=4.18.0 PKG_VERSION:=4.18.0
PKG_RELEASE:=3 PKG_RELEASE:=4
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@KERNEL/linux/utils/net/iproute2 PKG_SOURCE_URL:=@KERNEL/linux/utils/net/iproute2

8
package/network/utils/iproute2/patches/190-add-cake-to-tc.patch
View file

@ -854,7 +854,7 @@
TCMODULES += e_bpf.o TCMODULES += e_bpf.o
--- /dev/null --- /dev/null
+++ b/tc/q_cake.c +++ b/tc/q_cake.c
@@ -0,0 +1,801 @@ @@ -0,0 +1,805 @@
+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
+ +
+/* +/*
@ -1325,6 +1325,8 @@
+ +
+ if (nat) + if (nat)
+ print_string(PRINT_FP, NULL, "nat ", NULL); + print_string(PRINT_FP, NULL, "nat ", NULL);
+ else
+ print_string(PRINT_FP, NULL, "nonat ", NULL);
+ print_bool(PRINT_JSON, "nat", NULL, nat); + print_bool(PRINT_JSON, "nat", NULL, nat);
+ +
+ if (tb[TCA_CAKE_WASH] && + if (tb[TCA_CAKE_WASH] &&
@ -1365,6 +1367,8 @@
+ +
+ if (wash) + if (wash)
+ print_string(PRINT_FP, NULL, "wash ", NULL); + print_string(PRINT_FP, NULL, "wash ", NULL);
+ else
+ print_string(PRINT_FP, NULL, "nowash ", NULL);
+ print_bool(PRINT_JSON, "wash", NULL, wash); + print_bool(PRINT_JSON, "wash", NULL, wash);
+ +
+ if (ingress) + if (ingress)
@ -1377,7 +1381,7 @@
+ else if (ack_filter == CAKE_ACK_FILTER) + else if (ack_filter == CAKE_ACK_FILTER)
+ print_string(PRINT_ANY, "ack-filter", "ack-filter ", "enabled"); + print_string(PRINT_ANY, "ack-filter", "ack-filter ", "enabled");
+ else + else
+ print_string(PRINT_JSON, "ack-filter", NULL, "disabled"); + print_string(PRINT_ANY, "ack-filter", "no-ack-filter ", "disabled");
+ +
+ if (split_gso) + if (split_gso)
+ print_string(PRINT_FP, NULL, "split-gso ", NULL); + print_string(PRINT_FP, NULL, "split-gso ", NULL);