mirror of
https://codeberg.org/guix/guix.git
synced 2025-10-02 02:15:12 +00:00
2c814874a7
This fixes bug #1716. * gnu/packages/busybox.scm (busybox)[source]: Add patch. * gnu/packages/patches/busybox-no-cbq.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. Change-Id: Ia8cfdbb86a9ac2bca5b4c24ca91e5357ddf92539
56 lines
2.2 KiB
Diff
56 lines
2.2 KiB
Diff
Downloaded from Debian
|
|
https://sources.debian.org/data/main/b/busybox/1%3A1.37.0-6/debian/patches/busybox-1.36.1-no-cbq.patch
|
|
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1071648
|
|
Origin: fedora
|
|
Date: Tue, 16 Jul 2024 07:46:38 +0000
|
|
Forwarded: yes, https://bugs.busybox.net/show_bug.cgi?id=15931
|
|
|
|
diff -up busybox-1.36.1/networking/tc.c.no-cbq busybox-1.36.1/networking/tc.c
|
|
--- busybox-1.36.1/networking/tc.c.no-cbq 2024-01-29 10:24:09.135082923 -0500
|
|
+++ busybox-1.36.1/networking/tc.c 2024-01-29 10:28:12.009502552 -0500
|
|
@@ -31,7 +31,7 @@
|
|
//usage: "qdisc [handle QHANDLE] [root|"IF_FEATURE_TC_INGRESS("ingress|")"parent CLASSID]\n"
|
|
/* //usage: "[estimator INTERVAL TIME_CONSTANT]\n" */
|
|
//usage: " [[QDISC_KIND] [help|OPTIONS]]\n"
|
|
-//usage: " QDISC_KIND := [p|b]fifo|tbf|prio|cbq|red|etc.\n"
|
|
+//usage: " QDISC_KIND := [p|b]fifo|tbf|prio|red|etc.\n"
|
|
//usage: "qdisc show [dev STRING]"IF_FEATURE_TC_INGRESS(" [ingress]")"\n"
|
|
//usage: "class [classid CLASSID] [root|parent CLASSID]\n"
|
|
//usage: " [[QDISC_KIND] [help|OPTIONS] ]\n"
|
|
@@ -230,7 +230,7 @@ static int cbq_parse_opt(int argc, char
|
|
{
|
|
return 0;
|
|
}
|
|
-#endif
|
|
+
|
|
static int cbq_print_opt(struct rtattr *opt)
|
|
{
|
|
struct rtattr *tb[TCA_CBQ_MAX+1];
|
|
@@ -322,6 +322,7 @@ static int cbq_print_opt(struct rtattr *
|
|
done:
|
|
return 0;
|
|
}
|
|
+#endif
|
|
|
|
static FAST_FUNC int print_qdisc(
|
|
const struct sockaddr_nl *who UNUSED_PARAM,
|
|
@@ -373,7 +374,8 @@ static FAST_FUNC int print_qdisc(
|
|
if (qqq == 0) { /* pfifo_fast aka prio */
|
|
prio_print_opt(tb[TCA_OPTIONS]);
|
|
} else if (qqq == 1) { /* class based queuing */
|
|
- cbq_print_opt(tb[TCA_OPTIONS]);
|
|
+ /* cbq_print_opt(tb[TCA_OPTIONS]); */
|
|
+ printf("cbq not supported");
|
|
} else {
|
|
/* don't know how to print options for this qdisc */
|
|
printf("(options for %s)", name);
|
|
@@ -444,7 +446,8 @@ static FAST_FUNC int print_class(
|
|
/* nothing. */ /*prio_print_opt(tb[TCA_OPTIONS]);*/
|
|
} else if (qqq == 1) { /* class based queuing */
|
|
/* cbq_print_copt() is identical to cbq_print_opt(). */
|
|
- cbq_print_opt(tb[TCA_OPTIONS]);
|
|
+ /* cbq_print_opt(tb[TCA_OPTIONS]); */
|
|
+ printf("cbq not supported");
|
|
} else {
|
|
/* don't know how to print options for this class */
|
|
printf("(options for %s)", name);
|