diff --git a/net/core/dev.c b/net/core/dev.c
index 8d133802372be7c0b27fbead20cb8a3cd36dfffb..60c51f7658870257571ee9455f95bb48888b4398 100644
--- a/net/core/dev.c
+++ b/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);
 			}
 		}
 	}