diff options
| author | Jarek Poplawski <jarkao2@gmail.com> | 2009-03-04 17:38:10 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-04 17:38:10 -0800 |
| commit | a883bf564ea555447a76682bb2d8d4bc92e23e0e (patch) | |
| tree | 211994ddc25999320fe47d2a58ba8105e00dfee7 | |
| parent | 9f8ac0b7b063be77f0de7a27fe5e6a0aa2cce58d (diff) | |
| download | linux-a883bf564ea555447a76682bb2d8d4bc92e23e0e.tar.gz linux-a883bf564ea555447a76682bb2d8d4bc92e23e0e.tar.bz2 linux-a883bf564ea555447a76682bb2d8d4bc92e23e0e.zip | |
pkt_sched: act_police: Fix a rate estimator test.
A commit c1b56878fb68e9c14070939ea4537ad4db79ffae "tc: policing requires
a rate estimator" introduced a test which invalidates previously working
configs, based on examples from iproute2: doc/actions/actions-general.
This is too rigorous: a rate estimator is needed only when police's
"avrate" option is used.
Reported-by: Joao Correia <joaomiguelcorreia@gmail.com>
Diagnosed-by: John Dykstra <john.dykstra1@gmail.com>
Signed-off-by: Jarek Poplawski <jarkao2@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/sched/act_police.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/net/sched/act_police.c b/net/sched/act_police.c index 5c72a116b1a4..f8f047b61245 100644 --- a/net/sched/act_police.c +++ b/net/sched/act_police.c @@ -183,13 +183,6 @@ override: if (R_tab == NULL) goto failure; - if (!est && (ret == ACT_P_CREATED || - !gen_estimator_active(&police->tcf_bstats, - &police->tcf_rate_est))) { - err = -EINVAL; - goto failure; - } - if (parm->peakrate.rate) { P_tab = qdisc_get_rtab(&parm->peakrate, tb[TCA_POLICE_PEAKRATE]); @@ -205,6 +198,12 @@ override: &police->tcf_lock, est); if (err) goto failure_unlock; + } else if (tb[TCA_POLICE_AVRATE] && + (ret == ACT_P_CREATED || + !gen_estimator_active(&police->tcf_bstats, + &police->tcf_rate_est))) { + err = -EINVAL; + goto failure_unlock; } /* No failure allowed after this point */ |