Commit db4094bc authored by Phil Sutter's avatar Phil Sutter Committed by David S. Miller

net: sched: ignore tx_queue_len when assigning default qdisc

Since alloc_netdev_mqs() sets IFF_NO_QUEUE for drivers not initializing
tx_queue_len, it is safe to assume that if tx_queue_len is zero,
dev->priv flags always contains IFF_NO_QUEUE.
Signed-off-by: default avatarPhil Sutter <phil@nwl.cc>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f84bb1ea
...@@ -735,7 +735,7 @@ static void attach_one_default_qdisc(struct net_device *dev, ...@@ -735,7 +735,7 @@ static void attach_one_default_qdisc(struct net_device *dev,
{ {
struct Qdisc *qdisc = &noqueue_qdisc; struct Qdisc *qdisc = &noqueue_qdisc;
if (dev->tx_queue_len && !(dev->priv_flags & IFF_NO_QUEUE)) { if (!(dev->priv_flags & IFF_NO_QUEUE)) {
qdisc = qdisc_create_dflt(dev_queue, qdisc = qdisc_create_dflt(dev_queue,
default_qdisc_ops, TC_H_ROOT); default_qdisc_ops, TC_H_ROOT);
if (!qdisc) { if (!qdisc) {
...@@ -756,7 +756,6 @@ static void attach_default_qdiscs(struct net_device *dev) ...@@ -756,7 +756,6 @@ static void attach_default_qdiscs(struct net_device *dev)
txq = netdev_get_tx_queue(dev, 0); txq = netdev_get_tx_queue(dev, 0);
if (!netif_is_multiqueue(dev) || if (!netif_is_multiqueue(dev) ||
dev->tx_queue_len == 0 ||
dev->priv_flags & IFF_NO_QUEUE) { dev->priv_flags & IFF_NO_QUEUE) {
netdev_for_each_tx_queue(dev, attach_one_default_qdisc, NULL); netdev_for_each_tx_queue(dev, attach_one_default_qdisc, NULL);
dev->qdisc = txq->qdisc_sleeping; dev->qdisc = txq->qdisc_sleeping;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment