From: Kevin Bracey Date: Thu, 6 Jan 2022 11:16:04 +0000 (+0200) Subject: q_cake: allow changing to diffserv3 X-Git-Tag: v5.17.0~33 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eb4206ecd0342ff92b1a85b7dae3d4fd1b5be1c6;p=thirdparty%2Fiproute2.git q_cake: allow changing to diffserv3 A diffserv3 option (enum value 0) was never sent to the kernel, so it was not possible to use "tc qdisc change" to select it. This also meant that were also relying on the kernel's default being diffserv3 when adding. If the default were to change, we wouldn't have been able to request diffserv3 explicitly. Signed-off-by: Kevin Bracey Acked-by: Toke Høiland-Jørgensen Signed-off-by: Stephen Hemminger --- diff --git a/tc/q_cake.c b/tc/q_cake.c index 4cfc1c002..c438b765e 100644 --- a/tc/q_cake.c +++ b/tc/q_cake.c @@ -95,7 +95,7 @@ static int cake_parse_opt(struct qdisc_util *qu, int argc, char **argv, bool overhead_override = false; bool overhead_set = false; unsigned int interval = 0; - unsigned int diffserv = 0; + int diffserv = -1; unsigned int memlimit = 0; unsigned int fwmark = 0; unsigned int target = 0; @@ -356,7 +356,7 @@ static int cake_parse_opt(struct qdisc_util *qu, int argc, char **argv, if (bandwidth || unlimited) addattr_l(n, 1024, TCA_CAKE_BASE_RATE64, &bandwidth, sizeof(bandwidth)); - if (diffserv) + if (diffserv != -1) addattr_l(n, 1024, TCA_CAKE_DIFFSERV_MODE, &diffserv, sizeof(diffserv)); if (atm != -1)