mirror of
https://github.com/termux/termux-packages.git
synced 2024-12-04 18:45:52 +00:00
55 lines
1.8 KiB
Diff
55 lines
1.8 KiB
Diff
https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8ad860a1ed9aa92adaa7dcf1c3fc78d0e2f80ce
|
|
|
|
http://lists.busybox.net/pipermail/busybox/2024-March/090678.html
|
|
https://bugs.gentoo.org/926872
|
|
|
|
Linux v6.8-rc1 removed the definitions related to CBQ making tc fail to
|
|
build. Add some #ifdefs to handle this missing support.
|
|
--- a/networking/tc.c
|
|
+++ b/networking/tc.c
|
|
@@ -231,6 +231,13 @@ static int cbq_parse_opt(int argc, char **argv, struct nlmsghdr *n)
|
|
return 0;
|
|
}
|
|
#endif
|
|
+
|
|
+#ifndef TCA_CBQ_MAX
|
|
+/*
|
|
+ * Linux v6.8-rc1~131^2~60^2^2 removed the uapi definitions for CBQ.
|
|
+ * See <A HREF="https://git.kernel.org/linus/33241dca48626">https://git.kernel.org/linus/33241dca48626</A>
|
|
+ */
|
|
+#else
|
|
static int cbq_print_opt(struct rtattr *opt)
|
|
{
|
|
struct rtattr *tb[TCA_CBQ_MAX+1];
|
|
@@ -322,6 +329,7 @@ static int cbq_print_opt(struct rtattr *opt)
|
|
done:
|
|
return 0;
|
|
}
|
|
+#endif
|
|
|
|
static FAST_FUNC int print_qdisc(
|
|
const struct sockaddr_nl *who UNUSED_PARAM,
|
|
@@ -372,8 +380,10 @@ static FAST_FUNC int print_qdisc(
|
|
int qqq = index_in_strings(_q_, name);
|
|
if (qqq == 0) { /* pfifo_fast aka prio */
|
|
prio_print_opt(tb[TCA_OPTIONS]);
|
|
+#ifdef TCA_CBQ_MAX
|
|
} else if (qqq == 1) { /* class based queuing */
|
|
cbq_print_opt(tb[TCA_OPTIONS]);
|
|
+#endif
|
|
} else {
|
|
/* don't know how to print options for this qdisc */
|
|
printf("(options for %s)", name);
|
|
@@ -442,9 +452,11 @@ static FAST_FUNC int print_class(
|
|
int qqq = index_in_strings(_q_, name);
|
|
if (qqq == 0) { /* pfifo_fast aka prio */
|
|
/* nothing. */ /*prio_print_opt(tb[TCA_OPTIONS]);*/
|
|
+#ifdef TCA_CBQ_MAX
|
|
} else if (qqq == 1) { /* class based queuing */
|
|
/* cbq_print_copt() is identical to cbq_print_opt(). */
|
|
cbq_print_opt(tb[TCA_OPTIONS]);
|
|
+#endif
|
|
} else {
|
|
/* don't know how to print options for this class */
|
|
printf("(options for %s)", name);
|