---

yaml --- r: 109675 b: refs/heads/master c: e8a83e1 h: refs/heads/master i: 109673: e4d8e28 109671: 47805e2 v: v3
git-mirror · Sep 8, 2008 · 9f465fe · 9f465fe
1 parent 9e1e1da
commit 9f465fe
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e3b802ba885b54f4050164c3cfd9e0ba9c73173a
+refs/heads/master: e8a83e10d7dfe5d0841062780769b30f65417e15
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
@@ -1991,8 +1991,13 @@ static void net_tx_action(struct softirq_action *h)
 				spin_unlock(root_lock);
 			} else {
 				if (!test_bit(__QDISC_STATE_DEACTIVATED,
-					      &q->state))
+					      &q->state)) {
 					__netif_reschedule(q);
+				} else {
+					smp_mb__before_clear_bit();
+					clear_bit(__QDISC_STATE_SCHED,
+						  &q->state);
+				}
 			}
 		}
 	}