]> err.no Git - linux-2.6/commitdiff
[NET_SCHED]: qdisc: remove unnecessary memory barriers
authorPatrick McHardy <kaber@trash.net>
Fri, 23 Mar 2007 18:30:04 +0000 (11:30 -0700)
committerDavid S. Miller <davem@sunset.davemloft.net>
Thu, 26 Apr 2007 05:27:58 +0000 (22:27 -0700)
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>
net/sched/sch_api.c

index 5b5bce0694e2deeac96f62020b04229d18a69563..2e863bdaa9a1fdf64b39035ed071c90b73801be0 100644 (file)
@@ -322,7 +322,6 @@ void qdisc_watchdog_schedule(struct qdisc_watchdog *wd, psched_time_t expires)
        ktime_t time;
 
        wd->qdisc->flags |= TCQ_F_THROTTLED;
-       smp_wmb();
        time = ktime_set(0, 0);
        time = ktime_add_ns(time, PSCHED_US2NS(expires));
        hrtimer_start(&wd->timer, time, HRTIMER_MODE_ABS);
@@ -333,7 +332,6 @@ void qdisc_watchdog_cancel(struct qdisc_watchdog *wd)
 {
        hrtimer_cancel(&wd->timer);
        wd->qdisc->flags &= ~TCQ_F_THROTTLED;
-       smp_wmb();
 }
 EXPORT_SYMBOL(qdisc_watchdog_cancel);