hak5
/
openwrt-owl
mirror of https://github.com/hak5/openwrt-owl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
Kevin Darbyshire-Bryant 2017-01-28 16:44:30 +00:00 committed by Jo-Philipp Wich
parent 4f5ff0041a
commit 4cd9625dd4
2 changed files with 24 additions and 11 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.4.0 PKG_VERSION:=4.4.0
PKG_RELEASE:=7 PKG_RELEASE:=8
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

33
package/network/utils/iproute2/patches/950-add-cake-to-tc.patch
View File

@ -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 --- a/include/linux/pkt_sched.h
+++ b/include/linux/pkt_sched.h +++ b/include/linux/pkt_sched.h
@@ -850,4 +850,60 @@ struct tc_pie_xstats { @@ -850,4 +850,60 @@ struct tc_pie_xstats {
@ -13,7 +15,6 @@
+ TCA_CAKE_ATM, + TCA_CAKE_ATM,
+ TCA_CAKE_FLOW_MODE, + TCA_CAKE_FLOW_MODE,
+ TCA_CAKE_OVERHEAD, + TCA_CAKE_OVERHEAD,
+ TCA_CAKE_MPU,
+ TCA_CAKE_RTT, + TCA_CAKE_RTT,
+ TCA_CAKE_TARGET, + TCA_CAKE_TARGET,
+ TCA_CAKE_AUTORATE, + TCA_CAKE_AUTORATE,
@ -21,6 +22,7 @@
+ TCA_CAKE_NAT, + TCA_CAKE_NAT,
+ TCA_CAKE_ETHERNET, + TCA_CAKE_ETHERNET,
+ TCA_CAKE_WASH, + TCA_CAKE_WASH,
+ TCA_CAKE_MPU,
+ __TCA_CAKE_MAX + __TCA_CAKE_MAX
+}; +};
+#define TCA_CAKE_MAX (__TCA_CAKE_MAX - 1) +#define TCA_CAKE_MAX (__TCA_CAKE_MAX - 1)
@ -61,6 +63,8 @@
+}; +};
+ +
#endif #endif
diff --git a/tc/Makefile b/tc/Makefile
index 56acbaa..d421b8e 100644
--- a/tc/Makefile --- a/tc/Makefile
+++ b/tc/Makefile +++ b/tc/Makefile
@@ -63,6 +63,7 @@ TCMODULES += q_codel.o @@ -63,6 +63,7 @@ TCMODULES += q_codel.o
@ -71,9 +75,12 @@
TCMODULES += q_hhf.o TCMODULES += q_hhf.o
TCMODULES += e_bpf.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 --- /dev/null
+++ b/tc/q_cake.c +++ b/tc/q_cake.c
@@ -0,0 +1,686 @@ @@ -0,0 +1,692 @@
+/* +/*
+ * Common Applications Kept Enhanced -- CAKE + * Common Applications Kept Enhanced -- CAKE
+ * + *
@ -127,14 +134,20 @@
+ +
+static void explain(void) +static void explain(void)
+{ +{
+ fprintf(stderr, "Usage: ... cake [ bandwidth RATE | unlimited* | autorate_ingress ]\n" + fprintf(stderr,
+ " [ rtt TIME | datacentre | lan | metro | regional | internet* | oceanic | satellite | interplanetary ]\n" +"Usage: ... cake [ bandwidth RATE | unlimited* | autorate_ingress ]\n"
+ " [ besteffort | precedence | diffserv8 | diffserv4 | diffserv-llt | diffserv3* ]\n" +" [ rtt TIME | datacentre | lan | metro | regional |\n"
+ " [ flowblind | srchost | dsthost | hosts | flows | dual-srchost | dual-dsthost | triple-isolate* ] [ nat | nonat* ]\n" +" internet* | oceanic | satellite | interplanetary ]\n"
+ " [ ptm | atm | noatm* ] [ overhead N | conservative | raw* ] [ mpu N ]\n" +" [ besteffort | diffserv8 | diffserv4 | diffserv-llt |\n"
+ " [ wash | nowash* ]\n" +" diffserv3* ]\n"
+ " [ memlimit LIMIT ]\n" +" [ flowblind | srchost | dsthost | hosts | flows |\n"
+ " (* marks defaults)\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, +static int cake_parse_opt(struct qdisc_util *qu, int argc, char **argv,