Commit 05a8c1cb authored Dec 22, 2008 by Jarek Poplawski Committed by David S. Miller Dec 22, 2008

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>

parent 4707470a

net/sched/sch_api.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -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;

net/sched/sch_netem.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -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;