Commit a883bf56 authored Mar 04, 2009 by Jarek Poplawski Committed by David S. Miller Mar 04, 2009

pkt_sched: act_police: Fix a rate estimator test.



A commit c1b56878 "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>

parent 9f8ac0b7

net/sched/act_police.c

+6 −7

Original line number	Diff line number	Diff line
		@@ -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 */