diff options
| author | Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk> | 2017-01-28 16:44:30 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2017-01-30 16:30:41 +0100 |
| commit | bdd1fad9e3af590867be15858e649cb55dcb6636 (patch) | |
| tree | e1cb934bef285a35d05894b232ba027fedc80feb | |
| parent | 8a8fa29e2024e4541605371e97bf2646a8f9abc1 (diff) | |
| download | upstream-bdd1fad9e3af590867be15858e649cb55dcb6636.tar.gz upstream-bdd1fad9e3af590867be15858e649cb55dcb6636.tar.bz2 upstream-bdd1fad9e3af590867be15858e649cb55dcb6636.zip | |
iproute2: cake: update cake support
Updated cake's tc patch to match the official cake repository
formatting.
Signed-off-by: Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>
| -rw-r--r-- | package/network/utils/iproute2/Makefile | 2 | ||||
| -rw-r--r-- | package/network/utils/iproute2/patches/950-add-cake-to-tc.patch | 33 |
2 files changed, 24 insertions, 11 deletions
diff --git a/package/network/utils/iproute2/Makefile b/package/network/utils/iproute2/Makefile index 196b844892..af8e64c242 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:=7 +PKG_RELEASE:=8 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 9ebc4937d2..8da17112be 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,3 +1,5 @@ +diff --git a/include/linux/pkt_sched.h b/include/linux/pkt_sched.h +index 8d2530d..c55a9a8 100644 --- a/include/linux/pkt_sched.h +++ b/include/linux/pkt_sched.h @@ -850,4 +850,60 @@ struct tc_pie_xstats { @@ -13,7 +15,6 @@ + TCA_CAKE_ATM, + TCA_CAKE_FLOW_MODE, + TCA_CAKE_OVERHEAD, -+ TCA_CAKE_MPU, + TCA_CAKE_RTT, + TCA_CAKE_TARGET, + TCA_CAKE_AUTORATE, @@ -21,6 +22,7 @@ + TCA_CAKE_NAT, + TCA_CAKE_ETHERNET, + TCA_CAKE_WASH, ++ TCA_CAKE_MPU, + __TCA_CAKE_MAX +}; +#define TCA_CAKE_MAX (__TCA_CAKE_MAX - 1) @@ -61,6 +63,8 @@ +}; + #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 @@ -71,9 +75,12 @@ 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..acbe56c --- /dev/null +++ b/tc/q_cake.c -@@ -0,0 +1,686 @@ +@@ -0,0 +1,692 @@ +/* + * Common Applications Kept Enhanced -- CAKE + * @@ -127,14 +134,20 @@ + +static void explain(void) +{ -+ 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 | 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* ] [ mpu N ]\n" -+ " [ wash | nowash* ]\n" -+ " [ memlimit LIMIT ]\n" -+ " (* marks defaults)\n"); ++ fprintf(stderr, ++"Usage: ... cake [ bandwidth RATE | unlimited* | autorate_ingress ]\n" ++" [ rtt TIME | datacentre | lan | metro | regional |\n" ++" internet* | oceanic | satellite | interplanetary ]\n" ++" [ besteffort | diffserv8 | diffserv4 | diffserv-llt |\n" ++" diffserv3* ]\n" ++" [ flowblind | srchost | dsthost | hosts | flows |\n" ++" dual-srchost | dual-dsthost | triple-isolate* ]\n" ++" [ nat | nonat* ]\n" ++" [ wash | nowash * ]\n" ++" [ memlimit LIMIT ]\n" ++" [ ptm | atm | noatm* ] [ overhead N | conservative | raw* ]\n" ++" [ mpu N ]\n" ++" (* marks defaults)\n"); +} + +static int cake_parse_opt(struct qdisc_util *qu, int argc, char **argv, |