aboutsummaryrefslogtreecommitdiffstats
path: root/net/sched/sch_api.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/sched/sch_api.c')
-rw-r--r--net/sched/sch_api.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c
index b06f20294ac0..fcaa4adefc82 100644
--- a/net/sched/sch_api.c
+++ b/net/sched/sch_api.c
@@ -298,6 +298,7 @@ static enum hrtimer_restart qdisc_watchdog(struct hrtimer *timer)
298 timer); 298 timer);
299 299
300 wd->qdisc->flags &= ~TCQ_F_THROTTLED; 300 wd->qdisc->flags &= ~TCQ_F_THROTTLED;
301 smp_wmb();
301 netif_schedule(wd->qdisc->dev); 302 netif_schedule(wd->qdisc->dev);
302 return HRTIMER_NORESTART; 303 return HRTIMER_NORESTART;
303} 304}
@@ -315,6 +316,7 @@ void qdisc_watchdog_schedule(struct qdisc_watchdog *wd, psched_time_t expires)
315 ktime_t time; 316 ktime_t time;
316 317
317 wd->qdisc->flags |= TCQ_F_THROTTLED; 318 wd->qdisc->flags |= TCQ_F_THROTTLED;
319 smp_wmb();
318 time = ktime_set(0, 0); 320 time = ktime_set(0, 0);
319 time = ktime_add_ns(time, PSCHED_US2NS(expires)); 321 time = ktime_add_ns(time, PSCHED_US2NS(expires));
320 hrtimer_start(&wd->timer, time, HRTIMER_MODE_ABS); 322 hrtimer_start(&wd->timer, time, HRTIMER_MODE_ABS);
@@ -325,6 +327,7 @@ void qdisc_watchdog_cancel(struct qdisc_watchdog *wd)
325{ 327{
326 hrtimer_cancel(&wd->timer); 328 hrtimer_cancel(&wd->timer);
327 wd->qdisc->flags &= ~TCQ_F_THROTTLED; 329 wd->qdisc->flags &= ~TCQ_F_THROTTLED;
330 smp_wmb();
328} 331}
329EXPORT_SYMBOL(qdisc_watchdog_cancel); 332EXPORT_SYMBOL(qdisc_watchdog_cancel);
330 333