From 07be56642f8346c77a50582b77acd325651c6823 Mon Sep 17 00:00:00 2001
From: Arjan van de Ven <arjan@linux.intel.com>
Date: Fri, 2 May 2008 16:21:07 -0700
Subject: [PATCH] --- yaml --- r: 95892 b: refs/heads/master c:
 b4192bbd85d29eb3bec7f9297d6464250e6a7a90 h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/net/sched/sch_generic.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 3211a4d6d91f..06f3c3d9d833 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 50aab54f3056ba28afc681f71adee41c399dde1e
+refs/heads/master: b4192bbd85d29eb3bec7f9297d6464250e6a7a90
diff --git a/trunk/net/sched/sch_generic.c b/trunk/net/sched/sch_generic.c
index b741618e4d54..d355e5e47fe3 100644
--- a/trunk/net/sched/sch_generic.c
+++ b/trunk/net/sched/sch_generic.c
@@ -219,6 +219,7 @@ static void dev_watchdog(unsigned long arg)
 				printk(KERN_INFO "NETDEV WATCHDOG: %s: transmit timed out\n",
 				       dev->name);
 				dev->tx_timeout(dev);
+				WARN_ON_ONCE(1);
 			}
 			if (!mod_timer(&dev->watchdog_timer, round_jiffies(jiffies + dev->watchdog_timeo)))
 				dev_hold(dev);