---

yaml --- r: 108853 b: refs/heads/master c: 195648b h: refs/heads/master i: 108851: 649f090 v: v3
git-mirror · Aug 19, 2008 · 8f0bf7a · 8f0bf7a
1 parent afa3168
commit 8f0bf7a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d2805395aadc105d7228511eb0f42d9eea912003
+refs/heads/master: 195648bbc5ae0848e82f771ecf4cd7497054c212
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
@@ -1990,7 +1990,9 @@ static void net_tx_action(struct softirq_action *h)
 				qdisc_run(q);
 				spin_unlock(root_lock);
 			} else {
-				__netif_reschedule(q);
+				if (!test_bit(__QDISC_STATE_DEACTIVATED,
+					      &q->state))
+					__netif_reschedule(q);
 			}
 		}
 	}