diff --git a/[refs] b/[refs]
index b9344e5fa027..31a5a9b60a64 100644
--- 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
index 8d133802372b..60c51f765887 100644
--- 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);
 			}
 		}
 	}