projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
net: convert BUG_TRAP to generic WARN_ON
[linux-2.6-block.git]
/
net
/
sched
/
sch_generic.c
diff --git
a/net/sched/sch_generic.c
b/net/sched/sch_generic.c
index 43abd4d27ea6d767ae9c2227510b2628bb3d2a90..fd2a6cadb1155429fff6de7aa4045ef00899deb9 100644
(file)
--- a/
net/sched/sch_generic.c
+++ b/
net/sched/sch_generic.c
@@
-746,5
+746,5
@@
void dev_shutdown(struct net_device *dev)
{
netdev_for_each_tx_queue(dev, shutdown_scheduler_queue, &noop_qdisc);
shutdown_scheduler_queue(dev, &dev->rx_queue, NULL);
-
BUG_TRAP(!
timer_pending(&dev->watchdog_timer));
+
WARN_ON(
timer_pending(&dev->watchdog_timer));
}