diff options
| author | Jarek Poplawski <jarkao2@gmail.com> | 2008-08-27 02:25:17 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-08-27 02:25:17 -0700 |
| commit | f6f9b93f1624206c802ac9162c9302edaf59bfd9 (patch) | |
| tree | 643bd211bf909118311138e588a78834fad7a40d /net/sched/sch_htb.c | |
| parent | f7a54c13c7b072d9426bd5cec1cdb8306df5ef55 (diff) | |
| download | blackbird-op-linux-f6f9b93f1624206c802ac9162c9302edaf59bfd9.tar.gz blackbird-op-linux-f6f9b93f1624206c802ac9162c9302edaf59bfd9.zip | |
pkt_sched: Fix gen_estimator locks
While passing a qdisc root lock to gen_new_estimator() and
gen_replace_estimator() dev could be deactivated or even before
grafting proper root qdisc as qdisc_sleeping (e.g. qdisc_create), so
using qdisc_root_lock() is not enough. This patch adds
qdisc_root_sleeping_lock() for this, plus additional checks, where
necessary.
Signed-off-by: Jarek Poplawski <jarkao2@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/sch_htb.c')
| -rw-r--r-- | net/sched/sch_htb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c index 0df0df202ed0..97d4761cc31e 100644 --- a/net/sched/sch_htb.c +++ b/net/sched/sch_htb.c @@ -1372,7 +1372,7 @@ static int htb_change_class(struct Qdisc *sch, u32 classid, goto failure; gen_new_estimator(&cl->bstats, &cl->rate_est, - qdisc_root_lock(sch), + qdisc_root_sleeping_lock(sch), tca[TCA_RATE] ? : &est.nla); cl->refcnt = 1; cl->children = 0; @@ -1427,7 +1427,7 @@ static int htb_change_class(struct Qdisc *sch, u32 classid, } else { if (tca[TCA_RATE]) gen_replace_estimator(&cl->bstats, &cl->rate_est, - qdisc_root_lock(sch), + qdisc_root_sleeping_lock(sch), tca[TCA_RATE]); sch_tree_lock(sch); } |
