diff options
Diffstat (limited to 'net/sched/sch_htb.c')
| -rw-r--r-- | net/sched/sch_htb.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c index 0df0df202ed0..d14f02056ae6 100644 --- a/net/sched/sch_htb.c +++ b/net/sched/sch_htb.c | |||
| @@ -1043,7 +1043,7 @@ static int htb_init(struct Qdisc *sch, struct nlattr *opt) | |||
| 1043 | 1043 | ||
| 1044 | static int htb_dump(struct Qdisc *sch, struct sk_buff *skb) | 1044 | static int htb_dump(struct Qdisc *sch, struct sk_buff *skb) |
| 1045 | { | 1045 | { |
| 1046 | spinlock_t *root_lock = qdisc_root_lock(sch); | 1046 | spinlock_t *root_lock = qdisc_root_sleeping_lock(sch); |
| 1047 | struct htb_sched *q = qdisc_priv(sch); | 1047 | struct htb_sched *q = qdisc_priv(sch); |
| 1048 | struct nlattr *nest; | 1048 | struct nlattr *nest; |
| 1049 | struct tc_htb_glob gopt; | 1049 | struct tc_htb_glob gopt; |
| @@ -1075,7 +1075,7 @@ static int htb_dump_class(struct Qdisc *sch, unsigned long arg, | |||
| 1075 | struct sk_buff *skb, struct tcmsg *tcm) | 1075 | struct sk_buff *skb, struct tcmsg *tcm) |
| 1076 | { | 1076 | { |
| 1077 | struct htb_class *cl = (struct htb_class *)arg; | 1077 | struct htb_class *cl = (struct htb_class *)arg; |
| 1078 | spinlock_t *root_lock = qdisc_root_lock(sch); | 1078 | spinlock_t *root_lock = qdisc_root_sleeping_lock(sch); |
| 1079 | struct nlattr *nest; | 1079 | struct nlattr *nest; |
| 1080 | struct tc_htb_opt opt; | 1080 | struct tc_htb_opt opt; |
| 1081 | 1081 | ||
| @@ -1372,7 +1372,7 @@ static int htb_change_class(struct Qdisc *sch, u32 classid, | |||
| 1372 | goto failure; | 1372 | goto failure; |
| 1373 | 1373 | ||
| 1374 | gen_new_estimator(&cl->bstats, &cl->rate_est, | 1374 | gen_new_estimator(&cl->bstats, &cl->rate_est, |
| 1375 | qdisc_root_lock(sch), | 1375 | qdisc_root_sleeping_lock(sch), |
| 1376 | tca[TCA_RATE] ? : &est.nla); | 1376 | tca[TCA_RATE] ? : &est.nla); |
| 1377 | cl->refcnt = 1; | 1377 | cl->refcnt = 1; |
| 1378 | cl->children = 0; | 1378 | cl->children = 0; |
| @@ -1427,7 +1427,7 @@ static int htb_change_class(struct Qdisc *sch, u32 classid, | |||
| 1427 | } else { | 1427 | } else { |
| 1428 | if (tca[TCA_RATE]) | 1428 | if (tca[TCA_RATE]) |
| 1429 | gen_replace_estimator(&cl->bstats, &cl->rate_est, | 1429 | gen_replace_estimator(&cl->bstats, &cl->rate_est, |
| 1430 | qdisc_root_lock(sch), | 1430 | qdisc_root_sleeping_lock(sch), |
| 1431 | tca[TCA_RATE]); | 1431 | tca[TCA_RATE]); |
| 1432 | sch_tree_lock(sch); | 1432 | sch_tree_lock(sch); |
| 1433 | } | 1433 | } |
