diff options
| author | David S. Miller <davem@davemloft.net> | 2011-06-06 16:41:33 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-06-06 16:41:33 -0700 |
| commit | 3019de124b9f5b1526cb3668b74af14371e21795 (patch) | |
| tree | 3b4fd5843b61f3a860824ec38827cf0256620eed /net/sched | |
| parent | 5a079c305ad4dda9708b7a29db4a8bd38e21c3a6 (diff) | |
| download | linux-3.10-3019de124b9f5b1526cb3668b74af14371e21795.tar.gz linux-3.10-3019de124b9f5b1526cb3668b74af14371e21795.tar.bz2 linux-3.10-3019de124b9f5b1526cb3668b74af14371e21795.zip | |
net: Rework netdev_drivername() to avoid warning.
This interface uses a temporary buffer, but for no real reason.
And now can generate warnings like:
net/sched/sch_generic.c: In function dev_watchdog
net/sched/sch_generic.c:254:10: warning: unused variable drivername
Just return driver->name directly or "".
Reported-by: Connor Hansen <cmdkhh@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched')
| -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 b1721d71c27..b4c680900d7 100644 --- a/net/sched/sch_generic.c +++ b/net/sched/sch_generic.c @@ -251,9 +251,8 @@ static void dev_watchdog(unsigned long arg) } if (some_queue_timedout) { - char drivername[64]; WARN_ONCE(1, KERN_INFO "NETDEV WATCHDOG: %s (%s): transmit queue %u timed out\n", - dev->name, netdev_drivername(dev, drivername, 64), i); + dev->name, netdev_drivername(dev), i); dev->netdev_ops->ndo_tx_timeout(dev); } if (!mod_timer(&dev->watchdog_timer, |