From: Dmitrii Shcherbakov <fw.dmitrii@yandex•com>
To: netdev@vger•kernel.org
Cc: Jesper Dangaard Brouer <brouer@redhat•com>,
Phil Sutter <phil@nwl•cc>,
Stephen Hemminger <stephen@networkplumber•org>
Subject: [PATCH 1/2] [iproute2] tc/q_htb.c: remove printing of a deprecated overhead value previously encoded as a part of mpu field
Date: Sat, 19 Dec 2015 18:25:52 +0300 [thread overview]
Message-ID: <3134751450538752@web30j.yandex.ru> (raw)
Remove printing according to the previously used encoding of mpu and overhead values within the tc_ratespec's mpu field. This encoding is no longer being used as a separate 'overhead' field in the ratespec structure has been introduced.
Signed-off-by: Dmitrii Shcherbakov <fw.dmitrii@yandex•com>
Acked-by: Jesper Dangaard Brouer <brouer@redhat•com>
Acked-by: Phil Sutter <phil@nwl•cc>
---
tc/q_htb.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/tc/q_htb.c b/tc/q_htb.c
index 7075a4c..e76d20a 100644
--- a/tc/q_htb.c
+++ b/tc/q_htb.c
@@ -273,7 +273,6 @@ static int htb_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt)
__u64 rate64, ceil64;
SPRINT_BUF(b1);
SPRINT_BUF(b2);
- SPRINT_BUF(b3);
SPRINT_BUF(b4);
if (opt == NULL)
@@ -313,16 +312,14 @@ static int htb_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt)
if (linklayer > TC_LINKLAYER_ETHERNET || show_details)
fprintf(f, "linklayer %s ", sprint_linklayer(linklayer, b4));
if (show_details) {
- fprintf(f, "burst %s/%u mpu %s overhead %s ",
+ fprintf(f, "burst %s/%u mpu %s ",
sprint_size(buffer, b1),
1<<hopt->rate.cell_log,
- sprint_size(hopt->rate.mpu&0xFF, b2),
- sprint_size((hopt->rate.mpu>>8)&0xFF, b3));
- fprintf(f, "cburst %s/%u mpu %s overhead %s ",
+ sprint_size(hopt->rate.mpu, b2));
+ fprintf(f, "cburst %s/%u mpu %s ",
sprint_size(cbuffer, b1),
1<<hopt->ceil.cell_log,
- sprint_size(hopt->ceil.mpu&0xFF, b2),
- sprint_size((hopt->ceil.mpu>>8)&0xFF, b3));
+ sprint_size(hopt->ceil.mpu, b2));
fprintf(f, "level %d ", (int)hopt->level);
} else {
fprintf(f, "burst %s ", sprint_size(buffer, b1));
--
2.5.0
next reply other threads:[~2015-12-19 15:25 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-19 15:25 Dmitrii Shcherbakov [this message]
2015-12-22 5:29 ` [PATCH 1/2] [iproute2] tc/q_htb.c: remove printing of a deprecated overhead value previously encoded as a part of mpu field Stephen Hemminger
2016-02-18 1:51 ` Stephen Hemminger
2016-02-22 12:41 ` Dmitrii Shcherbakov
[not found] <1450444599-29265-1-git-send-email-fw.dmitrii@yandex.com>
2015-12-18 14:13 ` Phil Sutter
2015-12-18 14:26 ` Jesper Dangaard Brouer
2015-12-18 15:56 ` Dmitrii Shcherbakov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=3134751450538752@web30j.yandex.ru \
--to=fw.dmitrii@yandex$(echo .)com \
--cc=brouer@redhat$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
--cc=phil@nwl$(echo .)cc \
--cc=stephen@networkplumber$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox