From c4b625f3bb36c32ab28179086fb3b13bbc88a625 Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Mon, 5 Jul 2021 18:40:12 +0800 Subject: [PATCH] iproute2: drop sprint_rate() and uses print_rate() --- package/network/utils/iproute2/Makefile | 2 +- .../utils/iproute2/patches/400-add-nss-qdisc.patch | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/network/utils/iproute2/Makefile b/package/network/utils/iproute2/Makefile index f31feb73a..6fddf4e15 100644 --- a/package/network/utils/iproute2/Makefile +++ b/package/network/utils/iproute2/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=iproute2 PKG_VERSION:=5.11.0 -PKG_RELEASE:=5 +PKG_RELEASE:=6 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@KERNEL/linux/utils/net/iproute2 diff --git a/package/network/utils/iproute2/patches/400-add-nss-qdisc.patch b/package/network/utils/iproute2/patches/400-add-nss-qdisc.patch index 68859225e..5b356e983 100644 --- a/package/network/utils/iproute2/patches/400-add-nss-qdisc.patch +++ b/package/network/utils/iproute2/patches/400-add-nss-qdisc.patch @@ -1134,7 +1134,7 @@ Index: iproute2-4.0.0/tc/q_nss.c + qopt = RTA_DATA(tb[TCA_NSSTBL_PARMS]); + + fprintf(f, "buffer/maxburst %s ", sprint_size(qopt->burst, b1)); -+ fprintf(f, "rate %s ", sprint_rate(qopt->rate, b1)); ++ tc_print_rate(PRINT_FP, NULL, "rate %s ", qopt->rate); + fprintf(f, "mtu %s ", sprint_size(qopt->mtu, b1)); + fprintf(f, "accel_mode %d ", qopt->accel_mode); + @@ -1440,7 +1440,7 @@ Index: iproute2-4.0.0/tc/q_nss.c + qopt = RTA_DATA(tb[TCA_NSSBF_CLASS_PARMS]); + + fprintf(f, "burst %s ", sprint_size(qopt->burst, b1)); -+ fprintf(f, "rate %s ", sprint_rate(qopt->rate, b1)); ++ tc_print_rate(PRINT_FP, NULL, "rate %s ", qopt->rate); + fprintf(f, "quantum %s ", sprint_size(qopt->quantum, b1)); + fprintf(f, "mtu %s ", sprint_size(qopt->mtu, b1)); + @@ -1999,9 +1999,9 @@ Index: iproute2-4.0.0/tc/q_nss.c + qopt = RTA_DATA(tb[TCA_NSSHTB_CLASS_PARMS]); + + fprintf(f, "burst %s ", sprint_size(qopt->burst, b1)); -+ fprintf(f, "rate %s ", sprint_rate(qopt->rate, b1)); ++ tc_print_rate(PRINT_FP, NULL, "rate %s ", qopt->rate); + fprintf(f, "cburst %s ", sprint_size(qopt->cburst, b1)); -+ fprintf(f, "crate %s ", sprint_rate(qopt->crate, b1)); ++ tc_print_rate(PRINT_FP, NULL, "crate %s ", qopt->crate); + fprintf(f, "priority %u ", qopt->priority); + fprintf(f, "quantum %s ", sprint_size(qopt->quantum, b1)); + fprintf(f, "overhead %s ", sprint_size(qopt->overhead, b1));