diff options
-rw-r--r-- | net/sched/sch_api.c | 1 | ||||
-rw-r--r-- | net/sched/sch_netem.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c index 6bc29e8a7f32..0fc4a18fd96f 100644 --- a/net/sched/sch_api.c +++ b/net/sched/sch_api.c | |||
@@ -450,7 +450,6 @@ static enum hrtimer_restart qdisc_watchdog(struct hrtimer *timer) | |||
450 | timer); | 450 | timer); |
451 | 451 | ||
452 | wd->qdisc->flags &= ~TCQ_F_THROTTLED; | 452 | wd->qdisc->flags &= ~TCQ_F_THROTTLED; |
453 | smp_wmb(); | ||
454 | __netif_schedule(qdisc_root(wd->qdisc)); | 453 | __netif_schedule(qdisc_root(wd->qdisc)); |
455 | 454 | ||
456 | return HRTIMER_NORESTART; | 455 | return HRTIMER_NORESTART; |
diff --git a/net/sched/sch_netem.c b/net/sched/sch_netem.c index 7e78f1c0f357..d876b8734848 100644 --- a/net/sched/sch_netem.c +++ b/net/sched/sch_netem.c | |||
@@ -266,7 +266,6 @@ static struct sk_buff *netem_dequeue(struct Qdisc *sch) | |||
266 | struct netem_sched_data *q = qdisc_priv(sch); | 266 | struct netem_sched_data *q = qdisc_priv(sch); |
267 | struct sk_buff *skb; | 267 | struct sk_buff *skb; |
268 | 268 | ||
269 | smp_mb(); | ||
270 | if (sch->flags & TCQ_F_THROTTLED) | 269 | if (sch->flags & TCQ_F_THROTTLED) |
271 | return NULL; | 270 | return NULL; |
272 | 271 | ||