]> git.ipfire.org Git - thirdparty/iproute2.git/commitdiff
htb: remove printing of a deprecated overhead value
authorDmitrii Shcherbakov <fw.dmitrii@yandex.com>
Sat, 19 Dec 2015 15:25:52 +0000 (18:25 +0300)
committerStephen Hemminger <stephen@networkplumber.org>
Thu, 18 Feb 2016 01:49:47 +0000 (17:49 -0800)
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

index 7075a4c00c22e5578be541c2d384282673c98fe8..e76d20a4061423524897df935cf453d70e726a7a 100644 (file)
@@ -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));