aboutsummaryrefslogtreecommitdiffstats
path: root/package/network
diff options
context:
space:
mode:
authorKevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>2016-12-19 09:13:42 +0000
committerJohn Crispin <john@phrozen.org>2016-12-20 09:35:36 +0100
commit197b11f325971fa883c1f69880d188cc3e8d9605 (patch)
tree03abb0599a9ddc2ab8b2c76bf6929fb228b26745 /package/network
parent305704f405fbc347a17dd69c1354ec3da448ea15 (diff)
downloadupstream-197b11f325971fa883c1f69880d188cc3e8d9605.tar.gz
upstream-197b11f325971fa883c1f69880d188cc3e8d9605.tar.bz2
upstream-197b11f325971fa883c1f69880d188cc3e8d9605.zip
iproute2: tc - update cake support
Update tc to track upstream cake changes: diffserv3 - a simple 3 tin classifier Also make diffserv3 and triple-isolate default Signed-off-by: Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>
Diffstat (limited to 'package/network')
-rw-r--r--package/network/utils/iproute2/Makefile2
-rw-r--r--package/network/utils/iproute2/patches/950-add-cake-to-tc.patch22
2 files changed, 13 insertions, 11 deletions
diff --git a/package/network/utils/iproute2/Makefile b/package/network/utils/iproute2/Makefile
index d147567929..620cce22a0 100644
--- a/package/network/utils/iproute2/Makefile
+++ b/package/network/utils/iproute2/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=iproute2
PKG_VERSION:=4.4.0
-PKG_RELEASE:=5
+PKG_RELEASE:=6
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@KERNEL/linux/utils/net/iproute2
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 d0fc66daaa..6c73fbaf25 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
@@ -1,5 +1,3 @@
-diff --git a/include/linux/pkt_sched.h b/include/linux/pkt_sched.h
-index 8d2530d..028b83c 100644
--- a/include/linux/pkt_sched.h
+++ b/include/linux/pkt_sched.h
@@ -850,4 +850,59 @@ struct tc_pie_xstats {
@@ -62,8 +60,6 @@ index 8d2530d..028b83c 100644
+};
+
#endif
-diff --git a/tc/Makefile b/tc/Makefile
-index 56acbaa..d421b8e 100644
--- a/tc/Makefile
+++ b/tc/Makefile
@@ -63,6 +63,7 @@ TCMODULES += q_codel.o
@@ -74,12 +70,9 @@ index 56acbaa..d421b8e 100644
TCMODULES += q_hhf.o
TCMODULES += e_bpf.o
-diff --git a/tc/q_cake.c b/tc/q_cake.c
-new file mode 100644
-index 0000000..14e5aab
--- /dev/null
+++ b/tc/q_cake.c
-@@ -0,0 +1,654 @@
+@@ -0,0 +1,663 @@
+/*
+ * Common Applications Kept Enhanced -- CAKE
+ *
@@ -135,8 +128,8 @@ index 0000000..14e5aab
+{
+ fprintf(stderr, "Usage: ... cake [ bandwidth RATE | unlimited* | autorate_ingress ]\n"
+ " [ rtt TIME | datacentre | lan | metro | regional | internet* | oceanic | satellite | interplanetary ]\n"
-+ " [ besteffort | precedence | diffserv8 | diffserv4* ]\n"
-+ " [ flowblind | srchost | dsthost | hosts | flows* | dual-srchost | dual-dsthost | triple-isolate ] [ nat | nonat* ]\n"
++ " [ besteffort | precedence | diffserv8 | diffserv4 | diffserv-llt | diffserv3* ]\n"
++ " [ flowblind | srchost | dsthost | hosts | flows | dual-srchost | dual-dsthost | triple-isolate* ] [ nat | nonat* ]\n"
+ " [ ptm | atm | noatm* ] [ overhead N | conservative | raw* ]\n"
+ " [ wash | nowash* ]\n"
+ " [ memlimit LIMIT ]\n"
@@ -224,6 +217,8 @@ index 0000000..14e5aab
+ diffserv = 4;
+ } else if (strcmp(*argv, "diffserv-llt") == 0) {
+ diffserv = 5;
++ } else if (strcmp(*argv, "diffserv3") == 0) {
++ diffserv = 6;
+
+ } else if (strcmp(*argv, "nowash") == 0) {
+ wash = 0;
@@ -472,6 +467,9 @@ index 0000000..14e5aab
+ case 5:
+ fprintf(f, "diffserv-llt ");
+ break;
++ case 6:
++ fprintf(f, "diffserv3 ");
++ break;
+ default:
+ fprintf(f, "(?diffserv?) ");
+ break;
@@ -621,6 +619,10 @@ index 0000000..14e5aab
+ fprintf(f, " capacity estimate: %s\n", sprint_rate(stnc->capacity_estimate, b1));
+
+ switch(stnc->tin_cnt) {
++ case 3:
++ fprintf(f, " Bulk Best Effort Voice\n");
++ break;
++
+ case 4:
+ fprintf(f, " Bulk Best Effort Video Voice\n");
+ break;