aboutsummaryrefslogtreecommitdiffstats
path: root/net/sched/sch_cbq.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/sched/sch_cbq.c')
-rw-r--r--net/sched/sch_cbq.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/sched/sch_cbq.c b/net/sched/sch_cbq.c
index 4aaf44c95c52..25ed522b2891 100644
--- a/net/sched/sch_cbq.c
+++ b/net/sched/sch_cbq.c
@@ -351,7 +351,7 @@ cbq_mark_toplevel(struct cbq_sched_data *q, struct cbq_class *cl)
351{ 351{
352 int toplevel = q->toplevel; 352 int toplevel = q->toplevel;
353 353
354 if (toplevel > cl->level && !(cl->q->flags & TCQ_F_THROTTLED)) { 354 if (toplevel > cl->level && !(qdisc_is_throttled(cl->q))) {
355 psched_time_t now; 355 psched_time_t now;
356 psched_tdiff_t incr; 356 psched_tdiff_t incr;
357 357
@@ -625,7 +625,7 @@ static enum hrtimer_restart cbq_undelay(struct hrtimer *timer)
625 hrtimer_start(&q->delay_timer, time, HRTIMER_MODE_ABS); 625 hrtimer_start(&q->delay_timer, time, HRTIMER_MODE_ABS);
626 } 626 }
627 627
628 sch->flags &= ~TCQ_F_THROTTLED; 628 qdisc_unthrottled(sch);
629 __netif_schedule(qdisc_root(sch)); 629 __netif_schedule(qdisc_root(sch));
630 return HRTIMER_NORESTART; 630 return HRTIMER_NORESTART;
631} 631}
@@ -974,7 +974,7 @@ cbq_dequeue(struct Qdisc *sch)
974 skb = cbq_dequeue_1(sch); 974 skb = cbq_dequeue_1(sch);
975 if (skb) { 975 if (skb) {
976 sch->q.qlen--; 976 sch->q.qlen--;
977 sch->flags &= ~TCQ_F_THROTTLED; 977 qdisc_unthrottled(sch);
978 return skb; 978 return skb;
979 } 979 }
980 980