matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

htb: remove printing of a deprecated overhead value 

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>
This commit is contained in:
Dmitrii Shcherbakov 2015-12-19 18:25:52 +03:00 committed by Stephen Hemminger
parent 478a8e5920
commit 1aea7fea26
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tc/q_htb.c
View File

@ -273,7 +273,6 @@ static int htb_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt)
__u64 rate64, ceil64; __u64 rate64, ceil64;
SPRINT_BUF(b1); SPRINT_BUF(b1);
SPRINT_BUF(b2); SPRINT_BUF(b2);
SPRINT_BUF(b3);
SPRINT_BUF(b4); SPRINT_BUF(b4);
if (opt == NULL) 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) if (linklayer > TC_LINKLAYER_ETHERNET || show_details)
fprintf(f, "linklayer %s ", sprint_linklayer(linklayer, b4)); fprintf(f, "linklayer %s ", sprint_linklayer(linklayer, b4));
if (show_details) { if (show_details) {
fprintf(f, "burst %s/%u mpu %s overhead %s ", fprintf(f, "burst %s/%u mpu %s ",
sprint_size(buffer, b1), sprint_size(buffer, b1),
1<<hopt->rate.cell_log, 1<<hopt->rate.cell_log,
sprint_size(hopt->rate.mpu&0xFF, b2), sprint_size(hopt->rate.mpu, b2));
sprint_size((hopt->rate.mpu>>8)&0xFF, b3)); fprintf(f, "cburst %s/%u mpu %s ",
fprintf(f, "cburst %s/%u mpu %s overhead %s ",
sprint_size(cbuffer, b1), sprint_size(cbuffer, b1),
1<<hopt->ceil.cell_log, 1<<hopt->ceil.cell_log,
sprint_size(hopt->ceil.mpu&0xFF, b2), sprint_size(hopt->ceil.mpu, b2));
sprint_size((hopt->ceil.mpu>>8)&0xFF, b3));
fprintf(f, "level %d ", (int)hopt->level); fprintf(f, "level %d ", (int)hopt->level);
} else { } else {
fprintf(f, "burst %s ", sprint_size(buffer, b1)); fprintf(f, "burst %s ", sprint_size(buffer, b1));