diff options
Diffstat (limited to 'net/sched/sch_api.c')
-rw-r--r-- | net/sched/sch_api.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c index 36ac0ec81ce0..374fcbef80e8 100644 --- a/net/sched/sch_api.c +++ b/net/sched/sch_api.c | |||
@@ -473,7 +473,7 @@ static enum hrtimer_restart qdisc_watchdog(struct hrtimer *timer) | |||
473 | struct qdisc_watchdog *wd = container_of(timer, struct qdisc_watchdog, | 473 | struct qdisc_watchdog *wd = container_of(timer, struct qdisc_watchdog, |
474 | timer); | 474 | timer); |
475 | 475 | ||
476 | wd->qdisc->flags &= ~TCQ_F_THROTTLED; | 476 | qdisc_unthrottled(wd->qdisc); |
477 | __netif_schedule(qdisc_root(wd->qdisc)); | 477 | __netif_schedule(qdisc_root(wd->qdisc)); |
478 | 478 | ||
479 | return HRTIMER_NORESTART; | 479 | return HRTIMER_NORESTART; |
@@ -495,7 +495,7 @@ void qdisc_watchdog_schedule(struct qdisc_watchdog *wd, psched_time_t expires) | |||
495 | &qdisc_root_sleeping(wd->qdisc)->state)) | 495 | &qdisc_root_sleeping(wd->qdisc)->state)) |
496 | return; | 496 | return; |
497 | 497 | ||
498 | wd->qdisc->flags |= TCQ_F_THROTTLED; | 498 | qdisc_throttled(wd->qdisc); |
499 | time = ktime_set(0, 0); | 499 | time = ktime_set(0, 0); |
500 | time = ktime_add_ns(time, PSCHED_TICKS2NS(expires)); | 500 | time = ktime_add_ns(time, PSCHED_TICKS2NS(expires)); |
501 | hrtimer_start(&wd->timer, time, HRTIMER_MODE_ABS); | 501 | hrtimer_start(&wd->timer, time, HRTIMER_MODE_ABS); |
@@ -505,7 +505,7 @@ EXPORT_SYMBOL(qdisc_watchdog_schedule); | |||
505 | void qdisc_watchdog_cancel(struct qdisc_watchdog *wd) | 505 | void qdisc_watchdog_cancel(struct qdisc_watchdog *wd) |
506 | { | 506 | { |
507 | hrtimer_cancel(&wd->timer); | 507 | hrtimer_cancel(&wd->timer); |
508 | wd->qdisc->flags &= ~TCQ_F_THROTTLED; | 508 | qdisc_unthrottled(wd->qdisc); |
509 | } | 509 | } |
510 | EXPORT_SYMBOL(qdisc_watchdog_cancel); | 510 | EXPORT_SYMBOL(qdisc_watchdog_cancel); |
511 | 511 | ||