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: Phil Sutter <[email protected]>
Signed-off-by: David S. Miller <[email protected]>

diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
index 942fea8405a476a3f4e23db9a826b8b5fe5f4ecd..f501b7409320a7e3f9199abaaefeabd211c097da 100644 (file)
--- a/net/sched/sch_generic.c
+++ b/net/sched/sch_generic.c
@@ -735,7 +735,7 @@ static void attach_one_default_qdisc(struct net_device *dev,
 {
        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,
                                          default_qdisc_ops, TC_H_ROOT);
                if (!qdisc) {
@@ -756,7 +756,6 @@ static void attach_default_qdiscs(struct net_device *dev)
        txq = netdev_get_tx_queue(dev, 0);
 
        if (!netif_is_multiqueue(dev) ||
-           dev->tx_queue_len == 0 ||
            dev->priv_flags & IFF_NO_QUEUE) {
                netdev_for_each_tx_queue(dev, attach_one_default_qdisc, NULL);
                dev->qdisc = txq->qdisc_sleeping;