From 6d8b69519474b9f11b8f5f15bd659e7d2753e140 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 21 Jul 2008 09:54:18 -0700
Subject: [PATCH] --- yaml --- r: 104483 b: refs/heads/master c:
 867d79fb9a4d5929ad8335c896fcfe11c3b2ef14 h: refs/heads/master i:   104481:
 3931e195e4bf7ff1cb3defeb3c721616b3dda601   104479:
 8654849cafd0c9c5b71a021518ec6db93a3e6050 v: v3

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

diff --git a/[refs] b/[refs]
index a8028c141007..5f516864496c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b6b2fed1f4802b8fcc9d7548a8f785225d38f9a3
+refs/heads/master: 867d79fb9a4d5929ad8335c896fcfe11c3b2ef14
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
index 7e2d5274333f..cbc34c0db376 100644
--- a/trunk/net/core/dev.c
+++ b/trunk/net/core/dev.c
@@ -1327,7 +1327,8 @@ static void dev_queue_xmit_nit(struct sk_buff *skb, struct net_device *dev)
 
 void __netif_schedule(struct Qdisc *q)
 {
-	BUG_ON(q == &noop_qdisc);
+	if (WARN_ON_ONCE(q == &noop_qdisc))
+		return;
 
 	if (!test_and_set_bit(__QDISC_STATE_SCHED, &q->state)) {
 		struct softnet_data *sd;