---

yaml --- r: 122849 b: refs/heads/master c: 05a8c1c h: refs/heads/master i: 122847: ea3d44a v: v3
git-mirror · Dec 23, 2008 · e4f425d · e4f425d
1 parent 39c8583
commit e4f425d
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 3 deletions.
diff --git 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
@@ -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
@@ -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;