diff options
author | Patrick McHardy <kaber@trash.net> | 2007-03-23 14:30:04 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-04-26 01:27:58 -0400 |
commit | c95e939508e64863a1c5c73a9e1a908784e06820 (patch) | |
tree | 35fb733cfa18f36379d0f88b1fbe8f860b40f902 | |
parent | a48b5a61448899040dfbd2e0cd55b06a2bd2466c (diff) |
[NET_SCHED]: qdisc: remove unnecessary memory barriers
We're holding dev->queue_lock in qdisc_watchdog_schedule and
qdisc_watchdog_cancel, no need for the barriers.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | net/sched/sch_api.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c index 5b5bce0694e2..2e863bdaa9a1 100644 --- a/net/sched/sch_api.c +++ b/net/sched/sch_api.c | |||
@@ -322,7 +322,6 @@ void qdisc_watchdog_schedule(struct qdisc_watchdog *wd, psched_time_t expires) | |||
322 | ktime_t time; | 322 | ktime_t time; |
323 | 323 | ||
324 | wd->qdisc->flags |= TCQ_F_THROTTLED; | 324 | wd->qdisc->flags |= TCQ_F_THROTTLED; |
325 | smp_wmb(); | ||
326 | time = ktime_set(0, 0); | 325 | time = ktime_set(0, 0); |
327 | time = ktime_add_ns(time, PSCHED_US2NS(expires)); | 326 | time = ktime_add_ns(time, PSCHED_US2NS(expires)); |
328 | hrtimer_start(&wd->timer, time, HRTIMER_MODE_ABS); | 327 | hrtimer_start(&wd->timer, time, HRTIMER_MODE_ABS); |
@@ -333,7 +332,6 @@ void qdisc_watchdog_cancel(struct qdisc_watchdog *wd) | |||
333 | { | 332 | { |
334 | hrtimer_cancel(&wd->timer); | 333 | hrtimer_cancel(&wd->timer); |
335 | wd->qdisc->flags &= ~TCQ_F_THROTTLED; | 334 | wd->qdisc->flags &= ~TCQ_F_THROTTLED; |
336 | smp_wmb(); | ||
337 | } | 335 | } |
338 | EXPORT_SYMBOL(qdisc_watchdog_cancel); | 336 | EXPORT_SYMBOL(qdisc_watchdog_cancel); |
339 | 337 | ||