From 3621e3650fdb853499391ff76179d6eb2994c3e8 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Wed, 23 Jul 2008 14:01:29 -0700
Subject: [PATCH] --- yaml --- r: 105575 b: refs/heads/master c:
 5b3ab1dbd401b36ba2f9bfee2d2dae252fd62cd8 h: refs/heads/master i:   105573:
 008c12c5ae2a02e6b64112a66c4a8f6a9610a9a3   105571:
 45228306ee2f0814e07187d3b88b45900d1aec92   105567:
 04fd434a5361556ad1230bc5d03774d68041a3fc v: v3

---
 [refs]               | 2 +-
 trunk/net/core/dev.c | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index f085b3363106..8090bda20a59 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8a6d2ea0cd121e3bfff4dbce5bc111874cf9e9d2
+refs/heads/master: 5b3ab1dbd401b36ba2f9bfee2d2dae252fd62cd8
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
index 6bf217da9d8f..ccf97f9f37eb 100644
--- a/trunk/net/core/dev.c
+++ b/trunk/net/core/dev.c
@@ -1341,9 +1341,6 @@ static void dev_queue_xmit_nit(struct sk_buff *skb, struct net_device *dev)
 
 void __netif_schedule(struct Qdisc *q)
 {
-	if (WARN_ON_ONCE(q == &noop_qdisc))
-		return;
-
 	if (!test_and_set_bit(__QDISC_STATE_SCHED, &q->state)) {
 		struct softnet_data *sd;
 		unsigned long flags;