diff options
| author | Eric Dumazet <eric.dumazet@gmail.com> | 2011-12-01 15:25:59 +0100 |
|---|---|---|
| committer | Stephen Hemminger <shemminger@vyatta.com> | 2011-12-01 09:23:49 -0800 |
| commit | ab15aeacf5a106cfb8e72cd6760e8cf134161ceb (patch) | |
| tree | 71bfb239cbe361e37fa602af5072aefd4ef8af29 | |
| parent | 0cf67ead7bdc95700958b9cfd341b75b4432bb88 (diff) | |
| download | platform_external_iproute2-ab15aeacf5a106cfb8e72cd6760e8cf134161ceb.tar.gz platform_external_iproute2-ab15aeacf5a106cfb8e72cd6760e8cf134161ceb.tar.bz2 platform_external_iproute2-ab15aeacf5a106cfb8e72cd6760e8cf134161ceb.zip | |
red: make burst optional
Documentation advises to set burst to (min+min+max)/(3*avpkt)
Let tc do this automatically if user doesnt provide burst himself.
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
| -rw-r--r-- | tc/q_choke.c | 2 | ||||
| -rw-r--r-- | tc/q_gred.c | 10 | ||||
| -rw-r--r-- | tc/q_red.c | 11 |
3 files changed, 15 insertions, 8 deletions
diff --git a/tc/q_choke.c b/tc/q_choke.c index 04a864f3..7816f62f 100644 --- a/tc/q_choke.c +++ b/tc/q_choke.c @@ -133,7 +133,7 @@ static int choke_parse_opt(struct qdisc_util *qu, int argc, char **argv, return -1; } if (wlog >= 10) - fprintf(stderr, "CHOKE: WARNING. Burst %d seems to be to large.\n", burst); + fprintf(stderr, "CHOKE: WARNING. Burst %d seems to be too large.\n", burst); opt.Wlog = wlog; wlog = tc_red_eval_P(opt.qth_min*avpkt, opt.qth_max*avpkt, probability); diff --git a/tc/q_gred.c b/tc/q_gred.c index 59651d36..5fa0cc76 100644 --- a/tc/q_gred.c +++ b/tc/q_gred.c @@ -215,19 +215,23 @@ static int gred_parse_opt(struct qdisc_util *qu, int argc, char **argv, struct n if (rate == 0) get_rate(&rate, "10Mbit"); - if (!opt.qth_min || !opt.qth_max || !burst || !opt.limit || !avpkt || + if (!opt.qth_min || !opt.qth_max || !opt.limit || !avpkt || (opt.DP<0)) { - fprintf(stderr, "Required parameter (min, max, burst, limit, " + fprintf(stderr, "Required parameter (min, max, limit, " "avpkt, DP) is missing\n"); return -1; } + if (!burst) { + burst = (2 * opt.qth_min + opt.qth_max) / (3 * avpkt); + fprintf(stderr, "GRED: set burst to %u\n", burst); + } if ((wlog = tc_red_eval_ewma(opt.qth_min, burst, avpkt)) < 0) { fprintf(stderr, "GRED: failed to calculate EWMA constant.\n"); return -1; } if (wlog >= 10) - fprintf(stderr, "GRED: WARNING. Burst %d seems to be to " + fprintf(stderr, "GRED: WARNING. Burst %d seems to be too " "large.\n", burst); opt.Wlog = wlog; if ((wlog = tc_red_eval_P(opt.qth_min, opt.qth_max, probability)) < 0) { @@ -104,17 +104,20 @@ static int red_parse_opt(struct qdisc_util *qu, int argc, char **argv, struct nl if (rate == 0) get_rate(&rate, "10Mbit"); - if (!opt.qth_min || !opt.qth_max || !burst || !opt.limit || !avpkt) { - fprintf(stderr, "Required parameter (min, max, burst, limit, avpkt) is missing\n"); + if (!opt.qth_min || !opt.qth_max || !opt.limit || !avpkt) { + fprintf(stderr, "RED: Required parameter (min, max, limit, avpkt) is missing\n"); return -1; } - + if (!burst) { + burst = (2 * opt.qth_min + opt.qth_max) / (3 * avpkt); + fprintf(stderr, "RED: set burst to %u\n", burst); + } if ((wlog = tc_red_eval_ewma(opt.qth_min, burst, avpkt)) < 0) { fprintf(stderr, "RED: failed to calculate EWMA constant.\n"); return -1; } if (wlog >= 10) - fprintf(stderr, "RED: WARNING. Burst %d seems to be to large.\n", burst); + fprintf(stderr, "RED: WARNING. Burst %d seems to be too large.\n", burst); opt.Wlog = wlog; if ((wlog = tc_red_eval_P(opt.qth_min, opt.qth_max, probability)) < 0) { fprintf(stderr, "RED: failed to calculate probability.\n"); |