diff options
author | Simon Horman <horms@verge.net.au> | 2008-08-27 22:47:46 +1000 |
---|---|---|
committer | Simon Horman <horms@verge.net.au> | 2008-08-27 22:47:46 +1000 |
commit | b18e30412dde08536c9df6eae3f571fddb560e7f (patch) | |
tree | 1ca4e3ea848d3035311f29a6f03cb884e82e6639 /net/sched/sch_htb.c | |
parent | 09bf825e8e3049db1d72d464d0a6b857cc037a43 (diff) | |
parent | f2455eb176ac87081bbfc9a44b21c7cd2bc1967e (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
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 0df0df202ed..97d4761cc31 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); } |