diff options
| author | Phil Sutter <phil@nwl.cc> | 2015-08-13 19:01:07 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-08-17 11:50:18 -0700 |
| commit | 4b469955685d58c2f8198bf817fc661600b7e3d0 (patch) | |
| tree | 96e2ab31bce5b78eee48db5658a1a3105ea4519a | |
| parent | fa8187c96471c49419c25d4ec3299d17d3f274b2 (diff) | |
| download | op-kernel-dev-4b469955685d58c2f8198bf817fc661600b7e3d0.zip op-kernel-dev-4b469955685d58c2f8198bf817fc661600b7e3d0.tar.gz | |
net: sch_generic: react upon IFF_NO_QUEUE flag
Handle IFF_NO_QUEUE as alternative to tx_queue_len being zero.
Signed-off-by: Phil Sutter <phil@nwl.cc>
Acked-by: Jesper Dangaard Brouer <brouer@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/sched/sch_generic.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c index 6efca30..942fea8 100644 --- 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) { + if (dev->tx_queue_len && !(dev->priv_flags & IFF_NO_QUEUE)) { qdisc = qdisc_create_dflt(dev_queue, default_qdisc_ops, TC_H_ROOT); if (!qdisc) { @@ -755,7 +755,9 @@ 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) { + 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; atomic_inc(&dev->qdisc->refcnt); |
