diff options
| author | Keith Packard <keithp@keithp.com> | 2011-06-21 15:02:57 -0400 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-06-21 15:02:57 -0400 |
| commit | 2cd1176bd9e92924242e779dcc5c8fc922f96659 (patch) | |
| tree | e9daa254647af2e7d9f99694e19976df0ea2a14d /net/sched/sch_generic.c | |
| parent | a18711120764dd96ed2ee6a4d436c448542bad77 (diff) | |
| parent | e92d03bff9a0d0bcbb812c9b1290ca96c9338d45 (diff) | |
Merge branch 'drm-intel-fixes' into drm-intel-next
Diffstat (limited to 'net/sched/sch_generic.c')
| -rw-r--r-- | net/sched/sch_generic.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c index b1721d71c27c..b4c680900d7a 100644 --- a/net/sched/sch_generic.c +++ b/net/sched/sch_generic.c | |||
| @@ -251,9 +251,8 @@ static void dev_watchdog(unsigned long arg) | |||
| 251 | } | 251 | } |
| 252 | 252 | ||
| 253 | if (some_queue_timedout) { | 253 | if (some_queue_timedout) { |
| 254 | char drivername[64]; | ||
| 255 | WARN_ONCE(1, KERN_INFO "NETDEV WATCHDOG: %s (%s): transmit queue %u timed out\n", | 254 | WARN_ONCE(1, KERN_INFO "NETDEV WATCHDOG: %s (%s): transmit queue %u timed out\n", |
| 256 | dev->name, netdev_drivername(dev, drivername, 64), i); | 255 | dev->name, netdev_drivername(dev), i); |
| 257 | dev->netdev_ops->ndo_tx_timeout(dev); | 256 | dev->netdev_ops->ndo_tx_timeout(dev); |
| 258 | } | 257 | } |
| 259 | if (!mod_timer(&dev->watchdog_timer, | 258 | if (!mod_timer(&dev->watchdog_timer, |