Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...

[firefly-linux-kernel-4.4.55.git] / net / sched / sch_mq.c

diff --git a/net/sched/sch_mq.c b/net/sched/sch_mq.c
index 2e56185736d67d589b78918ff59fd7641eb2377a..a8b2864a696be934114a3b23ccf75e0cb8c4d1d6 100644 (file)
--- a/net/sched/sch_mq.c
+++ b/net/sched/sch_mq.c
@@ -78,14 +78,19 @@ static void mq_attach(struct Qdisc *sch)
 {
        struct net_device *dev = qdisc_dev(sch);
        struct mq_sched *priv = qdisc_priv(sch);
-       struct Qdisc *qdisc;
+       struct Qdisc *qdisc, *old;
        unsigned int ntx;
 
        for (ntx = 0; ntx < dev->num_tx_queues; ntx++) {
                qdisc = priv->qdiscs[ntx];
-               qdisc = dev_graft_qdisc(qdisc->dev_queue, qdisc);
-               if (qdisc)
-                       qdisc_destroy(qdisc);
+               old = dev_graft_qdisc(qdisc->dev_queue, qdisc);
+               if (old)
+                       qdisc_destroy(old);
+#ifdef CONFIG_NET_SCHED
+               if (ntx < dev->real_num_tx_queues)
+                       qdisc_list_add(qdisc);
+#endif
+
        }
        kfree(priv->qdiscs);
        priv->qdiscs = NULL;