diff options
| author |   Phil Sutter <phil@nwl.cc> | 2015-08-27 21:21:36 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-08-27 17:14:29 -0700 |
| commit | f84bb1eac0275283ccd76455e20f926e186ea8c8 (patch) | |
| tree | 34835da4b0468e962af7db25d434c19769285c1a /net/core/dev.c | |
| parent | sock: fix kernel doc error (diff) | |
| download | linux-dev-f84bb1eac0275283ccd76455e20f926e186ea8c8.tar.xz linux-dev-f84bb1eac0275283ccd76455e20f926e186ea8c8.zip | |
net: fix IFF_NO_QUEUE for drivers using alloc_netdev
Printing a warning in alloc_netdev_mqs() if tx_queue_len is zero and
IFF_NO_QUEUE not set is not appropriate since drivers may use one of the
alloc_netdev* macros instead of alloc_etherdev*, thereby not
intentionally leaving tx_queue_len uninitialized. Instead check here if
tx_queue_len is zero and set IFF_NO_QUEUE, so the value of tx_queue_len
can be ignored in net/sched_generic.c.
Fixes: 906470c ("net: warn if drivers set tx_queue_len = 0")
Signed-off-by: Phil Sutter <phil@nwl.cc>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | net/core/dev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index a8e6cf4298d3..877c84834d81 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -7010,7 +7010,7 @@ struct net_device *alloc_netdev_mqs(int sizeof_priv, const char *name, setup(dev); if (!dev->tx_queue_len) - printk(KERN_WARNING "%s uses DEPRECATED zero tx_queue_len - convert driver to use IFF_NO_QUEUE instead.\n", name); + dev->priv_flags |= IFF_NO_QUEUE; dev->num_tx_queues = txqs; dev->real_num_tx_queues = txqs; |