diff --git a/[refs] b/[refs] index 48d8d52cbd3d..8ab2687ebc35 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4707470ae7441733822efcd680b0ef3971921c4d +refs/heads/master: 05a8c1cbfe368df8c0d4eff710c370d2aa10245a diff --git a/trunk/net/sched/sch_api.c b/trunk/net/sched/sch_api.c index 6bc29e8a7f32..0fc4a18fd96f 100644 --- a/trunk/net/sched/sch_api.c +++ b/trunk/net/sched/sch_api.c @@ -450,7 +450,6 @@ static enum hrtimer_restart qdisc_watchdog(struct hrtimer *timer) timer); wd->qdisc->flags &= ~TCQ_F_THROTTLED; - smp_wmb(); __netif_schedule(qdisc_root(wd->qdisc)); return HRTIMER_NORESTART; diff --git a/trunk/net/sched/sch_netem.c b/trunk/net/sched/sch_netem.c index 7e78f1c0f357..d876b8734848 100644 --- a/trunk/net/sched/sch_netem.c +++ b/trunk/net/sched/sch_netem.c @@ -266,7 +266,6 @@ static struct sk_buff *netem_dequeue(struct Qdisc *sch) struct netem_sched_data *q = qdisc_priv(sch); struct sk_buff *skb; - smp_mb(); if (sch->flags & TCQ_F_THROTTLED) return NULL;