diff options
| author | Jarek Poplawski <jarkao2@gmail.com> | 2008-12-22 19:44:13 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-12-22 19:44:13 -0800 |
| commit | 05a8c1cbfe368df8c0d4eff710c370d2aa10245a (patch) | |
| tree | fb1ed1dda4f25f0c7ee6facb9e3d10a45b324201 | |
| parent | 4707470ae7441733822efcd680b0ef3971921c4d (diff) | |
| download | linux-3.10-05a8c1cbfe368df8c0d4eff710c370d2aa10245a.tar.gz linux-3.10-05a8c1cbfe368df8c0d4eff710c370d2aa10245a.tar.bz2 linux-3.10-05a8c1cbfe368df8c0d4eff710c370d2aa10245a.zip | |
pkt_sched: Remove smp_wmb() in qdisc_watchdog()
While implementing a TCQ_F_THROTTLED flag there was used an smp_wmb()
in qdisc_watchdog(), but since this flag is practically used only in
sch_netem(), and since it's not even clear what reordering is avoided
here (TCQ_F_THROTTLED vs. __QDISC_STATE_SCHED?) it seems the barrier
could be safely removed.
Signed-off-by: Jarek Poplawski <jarkao2@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -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 6bc29e8a7f3..0fc4a18fd96 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) timer); wd->qdisc->flags &= ~TCQ_F_THROTTLED; - smp_wmb(); __netif_schedule(qdisc_root(wd->qdisc)); return HRTIMER_NORESTART; diff --git a/net/sched/sch_netem.c b/net/sched/sch_netem.c index 7e78f1c0f35..d876b873484 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) struct netem_sched_data *q = qdisc_priv(sch); struct sk_buff *skb; - smp_mb(); if (sch->flags & TCQ_F_THROTTLED) return NULL; |