[packages/iproute2] - updated wrr,esfq,srr patches; release 2
qboosh
qboosh at pld-linux.org
Tue Sep 17 21:56:41 CEST 2024
commit 82a4d0f1cac3b4e265b28daa703c42584501a49d
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Tue Sep 17 21:59:32 2024 +0200
- updated wrr,esfq,srr patches; release 2
esfq-iproute2.patch | 6 +++---
iproute2-2.2.4-wrr.patch | 10 +++++-----
iproute2-q_srr.v0.4.patch | 4 ++--
iproute2.spec | 2 +-
4 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/iproute2.spec b/iproute2.spec
index 6b23318..38f3e53 100644
--- a/iproute2.spec
+++ b/iproute2.spec
@@ -14,7 +14,7 @@ Summary(pl.UTF-8): Narzędzie do konfigurowania sieci
Summary(pt_BR.UTF-8): Ferramentas para roteamento avançado e configuração de interfaces de rede
Name: iproute2
Version: 6.11.0
-Release: 1
+Release: 2
License: GPL v2+
Group: Networking/Admin
Source0: https://www.kernel.org/pub/linux/utils/net/iproute2/%{name}-%{version}.tar.xz
diff --git a/esfq-iproute2.patch b/esfq-iproute2.patch
index 196d81c..8548a60 100644
--- a/esfq-iproute2.patch
+++ b/esfq-iproute2.patch
@@ -91,7 +91,7 @@ diff -Naur iproute2-2.6.19-061214.orig/tc/q_esfq.c iproute2-2.6.19-061214/tc/q_e
+
+#define usage() return(-1)
+
-+static int esfq_parse_opt(struct qdisc_util *qu, int argc, char **argv, struct nlmsghdr *n)
++static int esfq_parse_opt(const struct qdisc_util *qu, int argc, char **argv, struct nlmsghdr *n, const char *dev)
+{
+ int ok=0;
+ struct tc_esfq_qopt opt;
@@ -203,7 +203,7 @@ diff -Naur iproute2-2.6.19-061214.orig/tc/q_esfq.c iproute2-2.6.19-061214/tc/q_e
+ return 0;
+}
+
-+static int esfq_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt)
++static int esfq_print_opt(const struct qdisc_util *qu, FILE *f, struct rtattr *opt)
+{
+ struct tc_esfq_qopt *qopt;
+ SPRINT_BUF(b1);
@@ -264,7 +264,7 @@ diff -Naur iproute2-2.6.19-061214.orig/tc/q_esfq.c iproute2-2.6.19-061214/tc/q_e
+ return 0;
+}
+
-+static int esfq_print_xstats(struct qdisc_util *qu, FILE *f, struct rtattr *xstats)
++static int esfq_print_xstats(const struct qdisc_util *qu, FILE *f, struct rtattr *xstats)
+{
+ return 0;
+}
diff --git a/iproute2-2.2.4-wrr.patch b/iproute2-2.2.4-wrr.patch
index b844559..1ad370e 100644
--- a/iproute2-2.2.4-wrr.patch
+++ b/iproute2-2.2.4-wrr.patch
@@ -246,7 +246,7 @@ diff -urN iproute-2.6.20-070313-orig/tc/q_wrr.c iproute-2.6.20-070313/tc/q_wrr.c
+ return 0;
+}
+
-+static int wrr_parse_opt(struct qdisc_util *qu, int argc, char **argv, struct nlmsghdr *n)
++static int wrr_parse_opt(const struct qdisc_util *qu, int argc, char **argv, struct nlmsghdr *n, const char *dev)
+{
+ if(n->nlmsg_flags & NLM_F_CREATE) {
+ // This is a create request:
@@ -346,7 +346,7 @@ diff -urN iproute-2.6.20-070313-orig/tc/q_wrr.c iproute-2.6.20-070313/tc/q_wrr.c
+ return 0;
+}
+
-+static int wrr_parse_copt(struct qdisc_util *qu, int argc, char **argv, struct nlmsghdr *n) {
++static int wrr_parse_copt(const struct qdisc_util *qu, int argc, char **argv, struct nlmsghdr *n, const char *dev) {
+ struct tc_wrr_class_modf opt;
+
+ memset(&opt,0,sizeof(opt));
@@ -356,7 +356,7 @@ diff -urN iproute-2.6.20-070313-orig/tc/q_wrr.c iproute-2.6.20-070313/tc/q_wrr.c
+ return 0;
+}
+
-+static int wrr_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt)
++static int wrr_print_opt(const struct qdisc_util *qu, FILE *f, struct rtattr *opt)
+{
+ struct tc_wrr_qdisc_stats *qopt;
+
@@ -393,7 +393,7 @@ diff -urN iproute-2.6.20-070313-orig/tc/q_wrr.c iproute-2.6.20-070313/tc/q_wrr.c
+ return 0;
+}
+
-+static int wrr_print_copt(struct qdisc_util *qu, FILE *f, struct rtattr *opt) {
++static int wrr_print_copt(const struct qdisc_util *qu, FILE *f, struct rtattr *opt) {
+ struct tc_wrr_class_stats *copt;
+ long double d=(__u64)-1;
+
@@ -442,7 +442,7 @@ diff -urN iproute-2.6.20-070313-orig/tc/q_wrr.c iproute-2.6.20-070313/tc/q_wrr.c
+ return 0;
+}
+
-+static int wrr_print_xstats(struct qdisc_util *qu, FILE *f, struct rtattr *xstats)
++static int wrr_print_xstats(const struct qdisc_util *qu, FILE *f, struct rtattr *xstats)
+{
+ return 0;
+}
diff --git a/iproute2-q_srr.v0.4.patch b/iproute2-q_srr.v0.4.patch
index 9dfcfa2..810596d 100644
--- a/iproute2-q_srr.v0.4.patch
+++ b/iproute2-q_srr.v0.4.patch
@@ -41,7 +41,7 @@ diff -ruN iproute-20041019/tc/q_srr.c iproute-20041019.srr.patched.v0.4/tc/q_srr
+
+#define usage() return(-1)
+
-+static int srr_parse_opt(struct qdisc_util *qu, int argc, char **argv, struct nlmsghdr *n)
++static int srr_parse_opt(const struct qdisc_util *qu, int argc, char **argv, struct nlmsghdr *n, const char *dev)
+{
+ int ok=0;
+ struct tc_srr_qopt opt;
@@ -100,7 +100,7 @@ diff -ruN iproute-20041019/tc/q_srr.c iproute-20041019.srr.patched.v0.4/tc/q_srr
+ return 0;
+}
+
-+static int srr_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt)
++static int srr_print_opt(const struct qdisc_util *qu, FILE *f, struct rtattr *opt)
+{
+ struct tc_srr_qopt *qopt;
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/iproute2.git/commitdiff/82a4d0f1cac3b4e265b28daa703c42584501a49d
More information about the pld-cvs-commit
mailing list